添加修改商品

app-ghs/controllers/PicController.php

@@ -2,6 +2,7 @@
 
 namespace ghs\controllers;
 
+use bizHd\goods\classes\CategoryClass;
 use bizHd\goods\services\CategoryService;
 use bizHd\goods\services\PicCategoryService;
 use bizHd\goods\services\PicService;
@@ -58,7 +59,7 @@ class PicController extends BaseController
         if (empty($categoryIdList)) {
             util::fail('请选择分类');
         }
-        $merchantHas = CategoryService::getCategoryIdList($this->sjId);
+        $merchantHas = CategoryClass::getCategoryIds($this->sjId);
         $diff = array_diff($categoryIdList, $merchantHas);
         if (!empty($diff)) {
             util::fail('只能选择自己的分类');

app-hd/controllers/PicController.php

@@ -2,6 +2,7 @@
 
 namespace hd\controllers;
 
+use bizHd\goods\classes\CategoryClass;
 use bizHd\goods\services\CategoryService;
 use bizHd\goods\services\PicCategoryService;
 use bizHd\goods\services\PicService;
@@ -58,7 +59,7 @@ class PicController extends BaseController
         if (empty($categoryIdList)) {
             util::fail('请选择分类');
         }
-        $merchantHas = CategoryService::getCategoryIdList($this->sjId);
+        $merchantHas = CategoryClass::getCategoryIds($this->sjId);
         $diff = array_diff($categoryIdList, $merchantHas);
         if (!empty($diff)) {
             util::fail('只能选择自己的分类');

biz-hd/goods/classes/CategoryClass.php

@@ -16,12 +16,18 @@ class CategoryClass extends BaseClass
     //可以使用的分类：花束 花盒 蝴蝶兰 花篮 植物 永生花 散花 充值卡 花艺课 花礼 瓶器
 
     //取出商家所有的分类 ssh 2019.12.7
-    public static function getCategoryIdList($merchantId)
+    public static function getCategoryIds($merchantId)
     {
-        $category = self::getAllByCondition(['merchantId' => $merchantId, 'delStatus' => 0], null, '*', 'id');
+        $category = self::getCategory($merchantId);
         return empty($category) ? [] : array_keys($category);
     }
 
+    //获取商家分类，id作为键名 shish 2021.5.4
+    public static function getCategory($merchantId)
+    {
+        return $category = self::getAllByCondition(['merchantId' => $merchantId, 'delStatus' => 0], null, '*', 'id');
+    }
+
     //获取详情 ssh 2019.12.8
     public static function getInfo($id)
     {

biz-hd/goods/classes/GoodsClass.php

@@ -112,14 +112,16 @@ class GoodsClass extends BaseClass
         $py = $data['py'] ?? '';
 
         //处理分类
-        $hasCategoryIdList = CategoryClass::getCategoryIdList($merchantId);
-        $diff = array_diff($categoryIdList, $hasCategoryIdList);
+        $categoryData = CategoryClass::getCategory($merchantId);
+        $hasCategoryIds = array_keys($categoryData);
+        $diff = array_diff($categoryIdList, $hasCategoryIds);
         if (!empty($diff)) {
-            util::fail('您使用了别人的分类');
+            util::fail('不能使用别人的分类');
         }
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
-            $addCategory[] = ['gId' => $id, 'goodsName' => $goodsName, 'cId' => $categoryId, 'merchantId' => $data['merchantId'], 'py' => $py];
+            $cName = $categoryData[$categoryId]['categoryName'];
+            $addCategory[] = ['gId' => $id, 'goodsName' => $goodsName, 'cId' => $categoryId, 'cName' => $cName, 'merchantId' => $data['merchantId'], 'py' => $py];
         }
         GoodsCategoryClass::batchAdd($addCategory);
         //处理款式
@@ -146,16 +148,18 @@ class GoodsClass extends BaseClass
         $py = stringUtil::py($data['goodsName']);
         //处理分类
         $merchantId = $data['merchantId'];
-        $merchantHasCategoryIdList = CategoryClass::getCategoryIdList($merchantId);
-        $diff = array_diff($categoryIdList, $merchantHasCategoryIdList);
+        $categoryData = CategoryClass::getCategory($merchantId);
+        $hasCategoryIds = array_keys($categoryData);
+        $diff = array_diff($categoryIdList, $hasCategoryIds);
         if (!empty($diff)) {
-            util::fail('您使用了别人的分类');
+            util::fail('不能使用别人的分类');
         }
         //先删除再添加分类
         GoodsCategoryClass::delGoodsCategory($id);
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
-            $addCategory[] = ['gId' => $id, 'goodsName' => $data['goodsName'], 'py' => $py, 'cId' => $categoryId, 'merchantId' => $data['merchantId']];
+            $cName = $categoryData[$categoryId]['categoryName'];
+            $addCategory[] = ['gId' => $id, 'goodsName' => $data['goodsName'], 'py' => $py, 'cId' => $categoryId, 'cName' => $cName, 'merchantId' => $data['merchantId']];
         }
         GoodsCategoryClass::batchAdd($addCategory);
 

biz-hd/goods/services/CategoryService.php

@@ -52,13 +52,6 @@ class CategoryService extends BaseService
 		return empty($cat) ? [] : array_column($cat, 'categoryName');
 	}
 
-	//取出商家所有的分类ID ssh 2019.12.7
-	public static function getCategoryIdList($merchantId)
-	{
-		return CategoryClass::getCategoryIdList($merchantId);
-	}
-
-
 	//获取商家最靠前的分类id ssh 2019.12.2
 	public static function getTopCategoryId($merchantId)
 	{

biz-mall/goods/classes/GoodsClass.php

@@ -115,7 +115,7 @@ class GoodsClass extends BaseClass
         $goodsName = $goodsInfo['goodsName'];
 
         //处理分类
-        $hasCategoryIdList = CategoryClass::getCategoryIdList($merchantId);
+        $hasCategoryIdList = CategoryClass::getCategoryIds($merchantId);
         $diff = array_diff($categoryIdList, $hasCategoryIdList);
         if (!empty($diff)) {
             util::fail('您使用了别人的分类');
@@ -149,7 +149,7 @@ class GoodsClass extends BaseClass
 
         //处理分类
         $merchantId = $data['merchantId'];
-        $merchantHasCategoryIdList = CategoryClass::getCategoryIdList($merchantId);
+        $merchantHasCategoryIdList = CategoryClass::getCategoryIds($merchantId);
         $diff = array_diff($categoryIdList, $merchantHasCategoryIdList);
         if (!empty($diff)) {
             util::fail('您使用了别人的分类');

biz-mall/goods/services/CategoryService.php

@@ -54,7 +54,7 @@ class CategoryService extends BaseService
     //取出商家所有的分类ID ssh 2019.12.7
     public static function getCategoryIdList($merchantId)
     {
-        return CategoryClass::getCategoryIdList($merchantId);
+        return CategoryClass::getCategoryIds($merchantId);
     }
 
 

sql.sql

@@ -2292,3 +2292,4 @@ ALTER TABLE xhAdmin DROP INDEX `admin`;
 ALTER TABLE `xhAdmin` ADD INDEX `admin`(`mobile`,`style`);
 ALTER TABLE `xhGoodsCategory` ADD cName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '分类名称' AFTER `cId`;
 
+./yii goods/category 补商品的分类名称补回