product排序

app-ghs/controllers/ProductController.php

@@ -95,10 +95,10 @@ class ProductController extends BaseController
         $type = Yii::$app->request->get('type', '');
         $showPage = Yii::$app->request->get('showPage',0);
         if($showPage){
-            $res = ProductClass::getList("*",$where);
+            $res = ProductClass::getList("*",$where,"inTurn desc");
             $data = $res['list'];
         }else{
-            $data = ProductClass::getAllByCondition($where,null,"*");
+            $data = ProductClass::getAllByCondition($where,"inTurn desc","*");
         }
 
         $data = ProductClass::groupProductInfo($data);

app-hd/controllers/ProductController.php

@@ -61,4 +61,56 @@ class ProductController extends BaseController
         util::success($data);
     }
 
+    //当前门店所有花材分类
+    public function actionList()
+    {
+        //$classId = Yii::$app->request->get('classId',0);
+        $pyName = Yii::$app->request->get('py', '');
+//        $itemInfo = ItemClass::getGhsItemAll($this->sjId);
+//        $itemIds = array_column($itemInfo, 'itemId');
+        $where['merchantId'] = $this->sjId;
+
+        if ($pyName) {
+//            $pyNameItemIds = ItemClass::getItemIdsByPyName($pyName);
+//            $itemIds = array_intersect($itemIds, $pyNameItemIds);
+            $pyName = strtolower($pyName);
+            $where['py'] = $pyName;
+        }
+        $shopId = Yii::$app->request->get('shopId', 0);
+        if (!$shopId) {
+            $shopId = $this->shopId;
+        }
+        $where['shopId'] = $shopId;
+
+        $type = Yii::$app->request->get('type', '');
+        $showPage = Yii::$app->request->get('showPage',0);
+        if($showPage){
+            $res = ProductClass::getList("*",$where,"inTurn desc");
+            $data = $res['list'];
+        }else{
+            $data = ProductClass::getAllByCondition($where,"inTurn desc","*");
+        }
+
+        $data = ProductClass::groupProductInfo($data);
+        if ($type == 'waring') {
+            //库存预警
+            $newData = [];
+            foreach ($data as $v){
+                if($v['stock']  <= $v['stockWarning']) {
+                    $newData[] = $v;
+                }
+            }
+            util::success(['list' => $newData]);
+        }
+        if($showPage){
+            $res['list'] = $data;
+            util::success(['list' => $res]);
+        }else{
+            util::success(['list' => $data]);
+        }
+
+
+
+    }
+
 }