shish 4 лет назад
Родитель
Сommit
a23c3298e0

+ 4 - 0
app-hd/controllers/CategoryController.php

@@ -99,6 +99,10 @@ class CategoryController extends BaseController
         if (is_numeric($status)) {
             $where['status'] = $status;
         }
+        $flowerNum = $get['flowerNum'] ?? 0;
+        if (!empty($flowerNum)) {
+            $where['flowerNum'] = $flowerNum;
+        }
         $data = GoodsCategoryService::getGoodsList($where);
         util::success($data);
     }

+ 2 - 0
biz-hd/goods/classes/GoodsClass.php

@@ -241,6 +241,7 @@ class GoodsClass extends BaseClass
             $data['shopImg'] = json_encode($data['shopImg']);
         }
         $data['py'] = stringUtil::py($data['name']);
+        $flowerNum = $data['flowerNum'] ?? 0;
         $info = self::add($data, true);
         $id = $info->id;
         $name = $info->name;
@@ -262,6 +263,7 @@ class GoodsClass extends BaseClass
                 'py' => $py,
                 'mainId' => $mainId,
                 'flower' => $flower,
+                'flowerNum' => $flowerNum,
             ];
             GoodsCategoryClass::add($addCategory);
             CategoryClass::counters(['goodsNum' => 1], ['id' => $catId]);

+ 1 - 0
biz-hd/work/classes/WorkClass.php

@@ -78,6 +78,7 @@ class WorkClass extends BaseClass
                 'workId' => $workId,
                 'workSn' => $workSn,
                 'flower' => 1,
+                'flowerNum' => $flowerNum,
             ];
             if (!empty($catId)) {
                 $goodsData['catIds'] = [$catId];

+ 2 - 0
sql.txt

@@ -960,4 +960,6 @@ ALTER TABLE xhHdRefundGoods ADD price DECIMAL(15,2) NOT NULL DEFAULT '0.00' COMM
 
 ALTER TABLE xhHdRefundItem MODIFY `num` INT NOT NULL DEFAULT 0 COMMENT '花材数量';
 
+ALTER TABLE xhGoodsCategory ADD flowerNum SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '多少朵' AFTER `flower`;
+
 ---ssh 20220424