采购

app-ghs/controllers/CategoryController.php

@@ -81,12 +81,12 @@ class CategoryController extends BaseController
     //取分类下商品 ssh 2019.12.2
     public function actionGoodsList()
     {
-        $categoryId = Yii::$app->request->get('categoryId');
-        //没有分类默认取商家第一个分类
-        $categoryId = !empty($categoryId) ? $categoryId : CategoryService::getTopCategoryId($this->sjId);
+        $catId = Yii::$app->request->get('catId', '');
         $where = [];
         $where['sjId'] = $this->sjId;
-        $where['cId'] = $categoryId;
+        if (is_numeric($catId)) {
+            $where['cId'] = $catId;
+        }
         $where['delStatus'] = 0;
         $data = GoodsCategoryService::getGoodsList($where);
         util::success($data);

app-hd/controllers/GoodsController.php

@@ -25,6 +25,9 @@ class GoodsController extends BaseController
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
+            $post['mainId'] = $this->mainId ?? 0;
+            $post['sjId'] = $this->sjId ?? 0;
+            $post['shopId'] = $this->shopId ?? 0;
             GoodsClass::cgPlant($post);
             $transaction->commit();
             util::complete();

biz-hd/goods/classes/GoodsClass.php

@@ -47,6 +47,11 @@ class GoodsClass extends BaseClass
                 $div = bcmul($sendCost, $num, 2);
                 $cgPrice = bcadd($cgPrice, $div, 2);
             }
+            $catId = $data['catId'] ?? 0;
+            if (empty($catId)) {
+                util::fail('请选择分类');
+            }
+            $catIds = [$catId];
             $data = [
                 'name' => $name,
                 'flower' => 0,
@@ -58,13 +63,14 @@ class GoodsClass extends BaseClass
                 'status' => $status,
                 'delStatus' => $delStatus,
                 'shopImg' => $shopImg,
+                'catIds' => $catIds,
             ];
             $respond = self::addGoods($data);
             $goodsId = $respond->id ?? 0;
             $goodsData = json_encode([['goodsId' => $goodsId, 'num' => $num, 'price' => $cgPrice]]);
         }
         $goodsData = json_decode($goodsData, true);
-        if (empty($goodaInfo) || !is_array($goodsData)) {
+        if (empty($goodsData) || !is_array($goodsData)) {
             util::fail('没有找到商品');
         }
         $ids = array_column($goodsData, 'goodsId');
@@ -240,11 +246,21 @@ class GoodsClass extends BaseClass
         $sjId = $data['sjId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
+        $flower = $data['flower'] ?? 0;
         $categoryData = CategoryClass::getCategory($mainId);
         $catIds = $data['catIds'] ?? [];
         foreach ($catIds as $catId) {
             $cName = $categoryData[$catId]['categoryName'];
-            $addCategory = ['gId' => $id, 'name' => $name, 'cId' => $catId, 'cName' => $cName, 'sjId' => $sjId, 'py' => $py, 'mainId' => $mainId];
+            $addCategory = [
+                'gId' => $id,
+                'name' => $name,
+                'cId' => $catId,
+                'cName' => $cName,
+                'sjId' => $sjId,
+                'py' => $py,
+                'mainId' => $mainId,
+                'flower' => $flower,
+            ];
             GoodsCategoryClass::add($addCategory);
             CategoryClass::counters(['goodsNum' => 1], ['id' => $catId]);
         }