Переглянути джерело

fix: 编辑幸运2021商品时,重复添加幸运2021的SKU

joe 4 роки тому
батько
коміт
3a2581906a

+ 10 - 8
app/admin/controller/store/StoreProduct.php

@@ -333,14 +333,16 @@ class StoreProduct extends AuthController
                 $detail[0]['detail'] = ['规格' => '默认'];
             } else {
                 if ($cate_id[0] == Config::get('activity.lucky_cate_id')) {
-                    $attr[] = [
-                        'value' => '幸运',
-                        'detailValue' => '',
-                        'attrHidden' => '',
-                        'detail' => [
-                            20, 21
-                        ],
-                    ];
+                    if (!array_search('幸运', array_column($attr, 'value'))) {
+                        $attr[] = [
+                            'value' => '幸运',
+                            'detailValue' => '',
+                            'attrHidden' => '',
+                            'detail' => [
+                                20, 21
+                            ],
+                        ];
+                    }
                 }
             }
 

+ 3 - 1
app/admin/model/store/StoreProductAttr.php

@@ -53,7 +53,9 @@ class StoreProductAttr extends BaseModel
         }
         $attrCount = count($attrList);
         foreach ($valueList as $index => $value) {
-            if (!isset($value['detail']) || count($value['detail']) != $attrCount) return self::setErrorInfo('请填写正确的商品信息');
+            if (!isset($value['detail']) || count($value['detail']) != $attrCount) {
+                return self::setErrorInfo('请填写正确的商品信息');
+            }
             if (!isset($value['price']) || !is_numeric($value['price']) || floatval($value['price']) != $value['price'])
                 return self::setErrorInfo('请填写正确的商品价格');
             if (!isset($value['stock']) || !is_numeric($value['stock']) || intval($value['stock']) != $value['stock'])