Merge branch 'master' into dev

biz-ghs/item/classes/ItemClass.php

@@ -188,32 +188,43 @@ class ItemClass extends BaseClass
     public static function errorPrice($shop)
     {
         $mainId = $shop->mainId ?? 0;
-        $itemList = ItemClass::getAllByCondition(['mainId' => $mainId, 'delStatus' => 0, 'status' => 1], null, '*');
+        $itemList = ItemClass::getAllByCondition(['mainId' => $mainId, 'delStatus' => 0, 'status' => 1], null, 'id,name,price,skPrice,hjPrice');
         $arr = [];
         if (!empty($itemList)) {
             foreach ($itemList as $item) {
                 $name = $item['name'] ?? '';
                 $price = $item['price'] ?? 0;
+                $skPrice = $item['skPrice'] ?? 0;
+                $hjPrice = $item['hjPrice'] ?? 0;
                 $name = trim(strtolower($name));
                 $name = str_replace(" ", "", $name);
-
                 $hasLevel = true;
-                $keyName = '';
-                $keyLevel = 'a';
-                if (strstr($name, "a级") != false) {
-                    $keyName = str_replace("a级", "x级", $name);
+                $pfKeyName = '';
+                $lsKeyName = '';
+                $dkKeyName = '';
+                $keyLevel = '';
+                if (strstr($name, "a级")) {
+                    $pfKeyName = str_replace("a级", "-批发", $name);
+                    $lsKeyName = str_replace("a级", "-零售", $name);
+                    $dkKeyName = str_replace("a级", "-大客", $name);
                     $keyLevel = 'a';
-                } elseif (strstr($name, "b级") != false) {
-                    $keyName = str_replace("b级", "x级", $name);
+                } elseif (strstr($name, "b级")) {
+                    $pfKeyName = str_replace("b级", "-批发", $name);
+                    $lsKeyName = str_replace("b级", "-零售", $name);
+                    $dkKeyName = str_replace("b级", "-大客", $name);
                     $keyLevel = 'b';
-                } elseif (strstr($name, "c级") != false) {
-                    $keyName = str_replace("c级", "x级", $name);
+                } elseif (strstr($name, "c级")) {
+                    $pfKeyName = str_replace("c级", "-批发", $name);
+                    $lsKeyName = str_replace("c级", "-零售", $name);
+                    $dkKeyName = str_replace("c级", "-大客", $name);
                     $keyLevel = 'c';
                 } else {
                     $hasLevel = false;
                 }
                 if ($hasLevel) {
-                    $arr[$keyName][$keyLevel] = $price;
+                    $arr[$pfKeyName][$keyLevel] = $price;
+                    $arr[$lsKeyName][$keyLevel] = $skPrice;
+                    $arr[$dkKeyName][$keyLevel] = $hjPrice;
                 }
             }
         }