Merge branch 'master' into dev

app-ghs/controllers/ItemController.php

@@ -1001,8 +1001,10 @@ class ItemController extends BaseController
     public function actionGetErrorPrice()
     {
         $shop = $this->shop;
-        $list = ItemClass::errorPrice($shop);
-        util::success(['list' => $list]);
+        $ret = ItemClass::errorPrice($shop);
+        $list = $ret['data'] ?? [];
+        $map = $ret['map'] ?? [];
+        util::success(['list' => $list, 'map' => $map]);
     }
 
     //列出所有花材，包括特价花材列表 ssh 20220315
@@ -1220,7 +1222,7 @@ class ItemController extends BaseController
     public function actionDesc()
     {
         $itemId = Yii::$app->request->get('itemId', 0);
-        $picText = PicTextGhsItemClass::getByCondition(['mainId'=> $this->mainId, 'ghsItemId' => $itemId, 'delStatus' => 0], true);
+        $picText = PicTextGhsItemClass::getByCondition(['mainId' => $this->mainId, 'ghsItemId' => $itemId, 'delStatus' => 0], true);
         if (empty($picText)) {
             // 适配前端的返回处理 -- 本来要使用 util::fail()
             util::success('not_exist');
@@ -1241,7 +1243,7 @@ class ItemController extends BaseController
         }
 
         $data = $form->attributes;
-        $exists = PicTextGhsItemClass::exists(['mainId'=>$this->mainId, 'ghsItemId' => $data['itemId'], 'delStatus' => 0]);
+        $exists = PicTextGhsItemClass::exists(['mainId' => $this->mainId, 'ghsItemId' => $data['itemId'], 'delStatus' => 0]);
         if ($exists) {
             util::fail('该商品已存在图文内容，请勿重复添加');
         }

biz-ghs/item/classes/ItemClass.php

@@ -190,9 +190,11 @@ class ItemClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $itemList = ItemClass::getAllByCondition(['mainId' => $mainId, 'delStatus' => 0, 'status' => 1], null, 'id,name,price,skPrice,hjPrice');
         $arr = [];
+        $map = [];
         if (!empty($itemList)) {
             foreach ($itemList as $item) {
                 $name = $item['name'] ?? '';
+                $productId = $item['id'] ?? 0;
                 $price = $item['price'] ?? 0;
                 $skPrice = $item['skPrice'] ?? 0;
                 $hjPrice = $item['hjPrice'] ?? 0;
@@ -208,41 +210,65 @@ class ItemClass extends BaseClass
                     $lsKeyName = str_replace("a级", "-零售", $name);
                     $dkKeyName = str_replace("a级", "-大客", $name);
                     $keyLevel = 'a';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "b级")) {
                     $pfKeyName = str_replace("b级", "-批发", $name);
                     $lsKeyName = str_replace("b级", "-零售", $name);
                     $dkKeyName = str_replace("b级", "-大客", $name);
                     $keyLevel = 'b';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "c级")) {
                     $pfKeyName = str_replace("c级", "-批发", $name);
                     $lsKeyName = str_replace("c级", "-零售", $name);
                     $dkKeyName = str_replace("c级", "-大客", $name);
                     $keyLevel = 'c';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "d级")) {
                     $pfKeyName = str_replace("d级", "-批发", $name);
                     $lsKeyName = str_replace("d级", "-零售", $name);
                     $dkKeyName = str_replace("d级", "-大客", $name);
                     $keyLevel = 'd';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "a")) {
                     $pfKeyName = str_replace("a", "-批发", $name);
                     $lsKeyName = str_replace("a", "-零售", $name);
                     $dkKeyName = str_replace("a", "-大客", $name);
                     $keyLevel = 'a';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "b")) {
                     $pfKeyName = str_replace("b", "-批发", $name);
                     $lsKeyName = str_replace("b", "-零售", $name);
                     $dkKeyName = str_replace("b", "-大客", $name);
                     $keyLevel = 'b';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "c")) {
                     $pfKeyName = str_replace("c", "-批发", $name);
                     $lsKeyName = str_replace("c", "-零售", $name);
                     $dkKeyName = str_replace("c", "-大客", $name);
                     $keyLevel = 'c';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } elseif (strstr($name, "d")) {
                     $pfKeyName = str_replace("d", "-批发", $name);
                     $lsKeyName = str_replace("d", "-零售", $name);
                     $dkKeyName = str_replace("d", "-大客", $name);
                     $keyLevel = 'd';
+                    $map[$pfKeyName.$keyLevel] = $productId;
+                    $map[$lsKeyName.$keyLevel] = $productId;
+                    $map[$dkKeyName.$keyLevel] = $productId;
                 } else {
                     $hasLevel = false;
                 }
@@ -276,7 +302,7 @@ class ItemClass extends BaseClass
                 $data[] = array_merge(['name' => $name], $val);
             }
         }
-        return $data;
+        return ['data' => $data, 'map' => $map];
     }
 
     //初始化花材 lqh 2021.4.12  modify ssh 20210711