花材

app-ghs/controllers/ProductController.php

@@ -71,7 +71,7 @@ class ProductController extends BaseController
     //当前门店所有花材
     public function actionList()
     {
-        $classId = Yii::$app->request->get('classId',0);
+        $classId = Yii::$app->request->get('classId', 0);
         $pyName = Yii::$app->request->get('py', '');
 //        $itemInfo = ItemClass::getGhsItemAll($this->sjId);
 //        $itemIds = array_column($itemInfo, 'itemId');
@@ -83,9 +83,9 @@ class ProductController extends BaseController
             $pyName = strtolower($pyName);
             $where['py'] = $pyName;
         }
-        if($classId){
+        if ($classId) {
             //获取itemIds
-            $itemIds = ItemClass::getItemIdsByClassId($this->sjId,$classId);
+            $itemIds = ItemClass::getItemIdsByClassId($this->sjId, $classId);
             $where['itemId'] = ['in', $itemIds];
         }
         $shopId = Yii::$app->request->get('shopId', 0);
@@ -100,7 +100,7 @@ class ProductController extends BaseController
             $respond = ProductClass::getList("*", $where, "inTurn desc");
             $respond['list'] = ProductClass::groupProductInfo($respond['list']);
 
-            $respond['list'] = ProductClass::groupClassName($this->sjId,$respond['list']);
+            $respond['list'] = ProductClass::groupClassName($this->sjId, $respond['list']);
 
 
             util::success($respond);
@@ -108,7 +108,7 @@ class ProductController extends BaseController
         $data = ProductClass::getAllByCondition($where, "inTurn desc", "*");
 
         $data = ProductClass::groupProductInfo($data);
-        $data = ProductClass::groupClassName($this->sjId,$data);
+        $data = ProductClass::groupClassName($this->sjId, $data);
 
         if ($type == 'waring') {
             //库存预警
@@ -238,4 +238,5 @@ class ProductController extends BaseController
         $respond = ProductClass::getItemInfo($id);
         util::success($respond);
     }
+
 }

biz-ghs/product/classes/ProductClass.php

@@ -632,33 +632,33 @@ class ProductClass extends BaseClass
     }
 
     //获取当前门店下所有的product
-    public static function getAllProduct($sjId,$shopId,$field="*")
+    public static function getAllProduct($sjId, $shopId, $field = "*")
     {
         $where = [
-            'merchantId'=>$sjId,
-            'shopId'=>$shopId,
+            'merchantId' => $sjId,
+            'shopId' => $shopId,
         ];
-        return self::getAllByCondition($where,null,$field);
+        return self::getAllByCondition($where, null, $field);
     }
 
     //获取当前门店下所有花材的库存数量,及成本价,库存预警的花材数量  linqh 2021-04-20
-    public static function getProductStockByShopId($sjId,$shopId)
+    public static function getProductStockByShopId($sjId, $shopId)
     {
-        $productInfo = self::getAllProduct($sjId,$shopId,"*");
+        $productInfo = self::getAllProduct($sjId, $shopId, "*");
         $data = [
-            'stockBigNum'=>0,
-            'stockSmallNum'=>0,
-            'stockCost'=>0,
-            'stockWarning'=>0,
+            'stockBigNum' => 0,
+            'stockSmallNum' => 0,
+            'stockCost' => 0,
+            'stockWarning' => 0,
         ];
-        if($productInfo){
-            foreach ($productInfo as $v){
-                $stock = self::formatStock($v['stock'],$v['ratio']);
-                $data['stockBigNum'] = bcadd($data['stockBigNum'],$stock['bigNum']);
-                $data['stockSmallNum'] = bcadd($data['stockSmallNum'],$stock['smallNum']);
-                $data['stockCost'] = bcadd($data['stockCost'],bcmul($v['stock'],$v['cost'],2),2);
-                if($v['stock'] <= $v['stockWarning']) {
-                    $data['stockWarning'] ++;
+        if ($productInfo) {
+            foreach ($productInfo as $v) {
+                $stock = self::formatStock($v['stock'], $v['ratio']);
+                $data['stockBigNum'] = bcadd($data['stockBigNum'], $stock['bigNum']);
+                $data['stockSmallNum'] = bcadd($data['stockSmallNum'], $stock['smallNum']);
+                $data['stockCost'] = bcadd($data['stockCost'], bcmul($v['stock'], $v['cost'], 2), 2);
+                if ($v['stock'] <= $v['stockWarning']) {
+                    $data['stockWarning']++;
                 }
             }
         }
@@ -666,28 +666,29 @@ class ProductClass extends BaseClass
     }
 
     //补className
-    public static function groupClassName($sjId,$data)
+    public static function groupClassName($sjId, $data)
     {
         //补className
         //获取当前商家下所有itemId=>classId
-        $itemInfo = ItemClass::getGhsItemAll($sjId,"itemId,classId");
+        $itemInfo = ItemClass::getGhsItemAll($sjId, "itemId,classId");
         $itemClassMap = [];
-        foreach ($itemInfo as $v){
+        foreach ($itemInfo as $v) {
             $itemClassMap[$v['itemId']] = $v['classId'];
         }
         //获取classId=>name
-        $itemClassInfo = ItemClassClass::getAll($sjId,"id,name");
+        $itemClassInfo = ItemClassClass::getAll($sjId, "id,name");
         $classNameMap = [];
-        foreach ($itemClassInfo as $v){
+        foreach ($itemClassInfo as $v) {
             $classNameMap[$v['id']] = $v['name'];
         }
-        foreach ($data as $k=>$v){
+        foreach ($data as $k => $v) {
             $itemId = $v['itemId'];
-            $classId = $itemClassMap[$itemId]??0;
-            $className = $classNameMap[$classId]??'';
+            $classId = $itemClassMap[$itemId] ?? 0;
+            $className = $classNameMap[$classId] ?? '';
             $v['className'] = $className;
             $data[$k] = $v;
         }
         return $data;
     }
+
 }

biz-hd/goods/classes/GoodsClass.php

@@ -60,9 +60,6 @@ class GoodsClass extends BaseClass
                 }
             }
 
-            //临时加100块
-            //$price = $val['price'];
-            //$val['price'] = $price + 100;
             //商品的分类
             $category = GoodsCategoryService::getGoodsHasCategoryIdList($id);
             $val['categoryIdList'] = $category;

sql.sql

@@ -29,7 +29,7 @@ wxOpen 平台和公众号 小程序要补好
 =============================================================================
 
 
-要初始化的东西 花材的重量 花材的比例 成本价 加价
+要和供货商确认 要初始化的东西 花材的重量 花材的比例 成本价 加价 大小单位
 
 
 =============================================================================