Merge remote-tracking branch 'origin/dev' into dev

app/common/repositories/store/order/StoreOrderRepository.php

@@ -2510,6 +2510,12 @@ class StoreOrderRepository extends BaseRepository
             $attr = [];
             $arr = [];
 
+            if(!$attr_one){
+                $attr_one[] = '规格';
+            }
+            if(!$attr_two){
+                $attr_two[] = '默认';
+            }
             foreach ($attr_one as $key => $value) {
                 $attr[$value] = $attr_two[$key];
                 $arr[] = [

app/common/repositories/store/product/ProductRepository.php

@@ -525,11 +525,13 @@ class ProductRepository extends BaseRepository
     {
         $result = [];
         foreach ($data as $value) {
-            $result[] = [
-                'product_id' => $productId,
-                'mer_cate_id' => $value,
-                'mer_id' => $merId,
-            ];
+            if($value['category']){
+                $result[] = [
+                    'product_id' => $productId,
+                    'mer_cate_id' => $value,
+                    'mer_id' => $merId,
+                ];
+            }
         }
         return $result;
     }