Merge branch 'zhongqi-itemUpdate' into dev

app-ghs/controllers/ItemController.php

@@ -503,7 +503,6 @@ class ItemController extends BaseController
             }
         }
         $level = $custom->level ?? 1;
-        $field = '*';
 
         //只查我负责的花材
         $globalCgMyCharge = $get['globalCgMyCharge'] ?? 0;
@@ -537,6 +536,7 @@ class ItemController extends BaseController
             }
         }
 
+        $field = '*';
         $result = ProductClass::getList($field, $where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC]);
         $list = $result['list'] ?? [];
         if ($requestType == 'hasStockList') {

app-ghs/controllers/ProductController.php

@@ -387,106 +387,94 @@ class ProductController extends BaseController
             $level = $custom->level ?? 1;
         }
         $itemInfoData = [];
-        if ($requestType == 'hasStockList') {
-            //有库存的花材列表
-            $field = 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,avCost,addPrice,hjAddPrice,skMore';
+        $fieldMap = [
+            'hasStockList' => 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,avCost,addPrice,hjAddPrice,skMore,limitBuy',
+            'hideItem'     => 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,avCost,addPrice,hjAddPrice,skMore,limitBuy',
+            'changePrice'  => 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,skMore,hjAddPrice,variety,price,stock,onStock,presell,frontHide,reachNum,reachNumDiscount,limitBuy',
+            'changeStock'  => 'id,py,cover,name,cost,itemId,status,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,frontHide,limitBuy',
+            'kd'           => 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,hjDiscountPrice,skDiscountPrice,discountPrice,stock,weight,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio,frontHide,reachNum,reachNumDiscount,limitBuy',
+            'book'         => 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,hjDiscountPrice,skDiscountPrice,discountPrice,stock,weight,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio,frontHide,limitBuy',
+            'itemList'     => 'id,py,cover,name,cost,avCost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,addPrice,hjAddPrice,skMore,limitBuy',
+            'cgStaffList'  => 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,cgStaffId,cgStaffName,limitBuy',
+            'outList'      => 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status,limitBuy',
+            'stopList'     => 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status,delStatus,limitBuy',
+            'removeList'   => 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status,limitBuy',
+            'check'        => 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,frontHide,limitBuy',
+            'break'        => 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,frontHide,limitBuy',
+            'part'         => 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,limitBuy',
+            'stockOut'     => 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,smallRatio,frontHide,limitBuy',
+            'cg'           => 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,presell,ratioType,smallUnit,bigUnit,ratio,weight,frontHide,limitBuy',
+            'warning'      => 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,discountPrice,stock,onStock,actualSold,presell,bigUnit,stockWarning,status,frontHide,limitBuy',
+        ];
+
+        if (!isset($fieldMap[$requestType])) {
+            util::fail('没有数据');
+        }
+        $field = $fieldMap[$requestType];
+
+        // 获取数据
+        if ($requestType == 'warning') {
+            $itemInfoData = Product::find()->where("mainId={$this->mainId}")
+                ->andWhere('`stock`+`onStock`<`stockWarning`')
+                ->andWhere("delStatus=0")
+                ->select($field)->asArray()->all();
+        } else {
+            // 处理特殊的 where 条件
+            if ($requestType == 'cgStaffList') {
+                unset($where['status']);
+                $where['delStatus'] = 0;
+            } elseif ($requestType == 'outList') {
+                $where['status'] = 2;
+                $where['delStatus'] = 0;
+                $where['removeStatus'] = 0;
+            } elseif ($requestType == 'stopList') {
+                unset($where['status']);
+                $where['delStatus'] = 1;
+                $where['removeStatus'] = 0;
+            } elseif ($requestType == 'removeList') {
+                unset($where['status']);
+                $where['delStatus'] = 1;
+                $where['removeStatus'] = 1;
+            }
+
             $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
+        }
+
+        // 数据后处理
+        if ($requestType == 'hasStockList') {
             if (!empty($itemInfoData)) {
                 foreach ($itemInfoData as $key => $val) {
-                    //以下参数主要是网页批量改价要用到
                     $shortCover = $val['cover'] ?? '';
                     $itemInfoData[$key]['cover'] = imgUtil::groupImg($shortCover) . "?x-oss-process=image/resize,m_fill,h_100,w_100";
                     $itemInfoData[$key]['shortCover'] = $shortCover;
                 }
             }
-        } elseif ($requestType == 'hideItem') {
-            //隐藏花材列表
-            $field = 'id,py,cover,name,classId,itemId,price,skPrice,hjPrice,stock,onStock,cost,avCost,addPrice,hjAddPrice,skMore';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
         } elseif ($requestType == 'changePrice') {
-            $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,skMore,hjAddPrice,addPrice,variety,price,hjPrice,stock,onStock,presell,frontHide,reachNum,reachNumDiscount';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::changePriceGroup($itemInfoData, $level);
         } elseif ($requestType == 'changeStock') {
-            //修改库存列表
-            $field = 'id,py,cover,name,cost,itemId,status,classId,addPrice,skPrice,discountPrice,skMore,variety,price,stock,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::changeStockGroup($itemInfoData, $level);
         } elseif ($requestType == 'kd') {
-            //开单的花材列表
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,hjDiscountPrice,skDiscountPrice,discountPrice,stock,weight,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio,frontHide,reachNum,reachNumDiscount';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::kdItemGroup($itemInfoData, $level, $custom);
         } elseif ($requestType == 'book') {
-            //预订花材列表
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,hjDiscountPrice,skDiscountPrice,discountPrice,stock,weight,stockWarning,presell,ratioType,smallUnit,smallRatio,bigUnit,ratio,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::bookItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'itemList') {
-            //花材列表
-            $field = 'id,py,cover,name,cost,avCost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,addPrice,hjAddPrice,skMore';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::itemListGroup($itemInfoData, $level);
         } elseif ($requestType == 'cgStaffList') {
-            unset($where['status']);
-            $where['delStatus'] = 0;
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,hjPrice,discountPrice,hjDiscountPrice,skDiscountPrice,stock,onStock,actualSold,status,ratio,ratioType,presell,frontHide,auth,reachNum,reachNumDiscount,cgStaffId,cgStaffName';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::cgStaffListGroup($itemInfoData, $level);
-        } elseif ($requestType == 'outList') {
-            //下架花材列表
-            $where['status'] = 2;
-            $where['delStatus'] = 0;
-            $where['removeStatus'] = 0;
-            $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
-            $itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
-        } elseif ($requestType == 'stopList') {
-            //停用花材列表
-            unset($where['status']);
-            $where['delStatus'] = 1;
-            $where['removeStatus'] = 0;
-            $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status,delStatus';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
-            $itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
-        } elseif ($requestType == 'removeList') {
-            //删除花材列表
-            unset($where['status']);
-            $where['delStatus'] = 1;
-            $where['removeStatus'] = 1;
-            $field = 'id,py,cover,name,cost,itemId,classId,addPrice,skPrice,bigUnit,smallUnit,ratio,ratioType,discountPrice,skMore,variety,price,stock,presell,status';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
+        } elseif (in_array($requestType, ['outList', 'stopList', 'removeList'])) {
             $itemInfoData = ProductClass::simpleGroup($itemInfoData, $level);
         } elseif ($requestType == 'check') {
-            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::checkItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'break') {
-            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::breakItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'part') {
-            //拆散花材
-            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::partItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'stockOut') {
-            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,stockWarning,presell,ratioType,smallUnit,bigUnit,ratio,smallRatio,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::stockOutGroup($itemInfoData, $level);
         } elseif ($requestType == 'cg') {
-            $field = 'id,py,cover,name,itemId,classId,variety,price,discountPrice,stock,presell,ratioType,smallUnit,bigUnit,ratio,weight,frontHide';
-            $itemInfoData = ProductClass::getAllByCondition($where, ['inTurn' => SORT_DESC, 'actualSold' => SORT_DESC], $field);
             $itemInfoData = ProductClass::cgItemGroup($itemInfoData, $level);
         } elseif ($requestType == 'warning') {
-            $field = 'id,py,cover,name,cost,itemId,classId,skPrice,variety,price,discountPrice,stock,onStock,actualSold,presell,bigUnit,stockWarning,status,frontHide';
-            $itemInfoData = Product::find()->where("mainId={$this->mainId}")
-                ->andWhere('`stock`+`onStock`<`stockWarning`')
-                ->andWhere("delStatus=0")
-                ->select($field)->asArray()->all();
             $itemInfoData = ProductClass::warningGroup($itemInfoData, $level);
-        } else {
-            util::fail('没有数据');
         }
         $data = ProductService::assembleItemData($classInfo, $itemInfoData);
         util::success($data);

biz-ghs/item/models/ItemClass.php

@@ -1,13 +1,7 @@
 <?php
-/**
- * User: admin
- * Date Time: 2021/1/13 14:13
- */
-
 namespace bizGhs\item\models;
 
 use bizGhs\base\models\Base;
-use bizGhs\item\classes\ItemClassClass;
 
 class ItemClass extends Base
 {
@@ -15,5 +9,4 @@ class ItemClass extends Base
     {
         return 'xhGhsItemClass';
     }
-
 }

biz-hd/product/classes/ProductClass.php

@@ -435,7 +435,7 @@ class ProductClass extends BaseClass
      * @param $customId 零售xhCustom表的id
      * @param $num
      */
-    public static function handleLimitBuy($product, $customId, $num)
+    public static function handleLimitBuy($product, $customId, $num, $doCache = true)
     {
         $limitBuy = $product['limitBuy'];
         if ($limitBuy <= 0) {
@@ -458,7 +458,9 @@ class ProductClass extends BaseClass
 
                 util::error(-1, '累计已超出限购数', ['productId'=>$productId, 'limitBuy'=>$limitBuy, 'exceed'=>$lastNum - $limitBuy]);
             }
-            Yii::$app->redis->executeCommand('HSET', [$limitKey, $customId, $lastNum]);
+            if ($doCache) {
+                Yii::$app->redis->executeCommand('HSET', [$limitKey, $customId, $lastNum]);
+            }
         } else {
             self::recordLimitBuyRollbackSnapshot($productId, $customId, false, 0);
             if ($num > $limitBuy) {
@@ -469,7 +471,9 @@ class ProductClass extends BaseClass
                 }
                 util::error(-1, '超出限购数', ['productId'=>$productId, 'limitBuy'=>$limitBuy, 'exceed'=>$num - $limitBuy]);
             }
-            Yii::$app->redis->executeCommand('HSET', [$limitKey, $customId, $num]);
+            if ($doCache) {
+                Yii::$app->redis->executeCommand('HSET', [$limitKey, $customId, $num]);
+            }
         }
     }