shish 5 жил өмнө
parent
commit
22743f8af9

+ 0 - 1
app-ghs/controllers/ItemController.php

@@ -14,7 +14,6 @@ class ItemController extends BaseController
 
     public function actionList()
     {
-        $_GET['pageSize'] = 50;
         $classId = Yii::$app->request->get('classId', 0);
         $where['sjId'] = $this->sjId;
         if (!empty($classId)) {

+ 13 - 12
biz-ghs/product/classes/ProductClass.php

@@ -87,16 +87,17 @@ class ProductClass extends BaseClass
     //花材图片,名称,大小单位,小单位价格
     public static function groupProductInfo($list)
     {
-
         foreach ($list as $k => $v) {
+            $shortCover = $v['cover'] ?? '';
             if ($v['cover']) {
                 $cover = self::groupImg($v['cover']);
             } else {
-                $cover = imgUtil::getPrefix() . '/hhb_small.png';
+                $cover = imgUtil::getPrefix() . 'hhb_small.png';
             }
             $ratio = $v['ratio'];
             $stockInfo = self::formatStock($v['stock'], $ratio);
             $list[$k]['cover'] = $cover;
+            $list[$k]['shortCover'] = $shortCover;
             $list[$k]['bigNum'] = $stockInfo['bigNum'];
             $list[$k]['smallNum'] = $stockInfo['smallNum'];
             $list[$k]['itemName'] = $v['name'] ?? '';
@@ -178,7 +179,7 @@ class ProductClass extends BaseClass
     //获取常用的itemIds
     public static function getOftenItemIds($shopId)
     {
-        $data = self::getLimitList("itemId", ['shopId' => $shopId], 10, ['actualSold'=>SORT_DESC,'inTurn'=>SORT_DESC]);
+        $data = self::getLimitList("itemId", ['shopId' => $shopId], 10, ['actualSold' => SORT_DESC, 'inTurn' => SORT_DESC]);
         if ($data) {
             $data = array_column($data, 'itemId');
         }
@@ -214,7 +215,7 @@ class ProductClass extends BaseClass
         $newStock = bcadd($productData['stock'], $itemNum, 2);
         self::updateStockById($productId, $newStock);
         util::unlock($key);
-        return ['oldStock'=>$productData['stock'],'newStock'=>$newStock];
+        return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
     }
 
 
@@ -241,7 +242,7 @@ class ProductClass extends BaseClass
         $newStock = bcadd($productData->stock, $itemNum, 2);
         self::updateStockById($productId, $newStock);
         util::unlock($key);
-        return ['oldStock'=>$productData['stock'],'newStock'=>$newStock];
+        return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
     }
 
     //减库存,允许负库存,负数数量(盘点时)
@@ -253,7 +254,7 @@ class ProductClass extends BaseClass
      * @param $checkStock boolean 是否需要判断库存
      * @return mixed
      */
-    public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece,$checkStock=false)
+    public static function decreaseStock($productId, $itemNumBundle, $itemNumPiece, $checkStock = false)
     {
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
@@ -270,14 +271,14 @@ class ProductClass extends BaseClass
         //转成小数,更新库存
         $itemNum = self::mergeItemNum($itemNumBundle, $itemNumPiece, $ratio);
         $newStock = bcsub($productData->stock, $itemNum, 2);
-        if($checkStock && $newStock < 0){
+        if ($checkStock && $newStock < 0) {
             //需要判断库存是否充足
             util::unlock($key);
             util::fail("库存不足");
         }
         self::updateStockById($productId, $newStock);
         util::unlock($key);
-        return ['oldStock'=>$productData['stock'],'newStock'=>$newStock];
+        return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
     }
 
 
@@ -288,7 +289,7 @@ class ProductClass extends BaseClass
      * @param $itemNum
      * @return mixed  返回减之前的库存,和减之后的库存
      */
-    public static function decreaseStockByItemNum($productId, $itemNum,$checkStock=false)
+    public static function decreaseStockByItemNum($productId, $itemNum, $checkStock = false)
     {
         $key = self::LOCK_STOCK . '_' . $productId;
         $lock = util::lock($key);
@@ -301,14 +302,14 @@ class ProductClass extends BaseClass
             util::fail("花材不存在");
         }
         $newStock = bcsub($productData['stock'], $itemNum, 2);
-        if($checkStock && $newStock < 0){
+        if ($checkStock && $newStock < 0) {
             //需要判断库存是否充足
             util::unlock($key);
             util::fail("库存不足");
         }
         self::updateStockById($productId, $newStock);
         util::unlock($key);
-        return ['oldStock'=>$productData['stock'],'newStock'=>$newStock];
+        return ['oldStock' => $productData['stock'], 'newStock' => $newStock];
     }
 
 
@@ -762,7 +763,7 @@ class ProductClass extends BaseClass
     }
 
     //供应商、零售端新开门店时,初始化花材
-    public static function newShopInitProduct($sjId,$shopId,$newShopId,$adminId)
+    public static function newShopInitProduct($sjId, $shopId, $newShopId, $adminId)
     {
         $product = self::getAllProduct($sjId, $shopId, "name,cover,classId,itemId,rank,price,priceLabel,cost,addPrice,stockWarning,weight,alias,py,ratio,bigUnit,smallUnit,bigUnitId,smallUnitId,inTurn");
         $productData = [];