From 0350c4d655a37382c13e8308be5817f84c0e0bff Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 2 Dec 2023 18:32:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 0d8f07c1..2bc23d61 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/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[] = [

From 08b6c51ab1095463ac90a5a5658a8d7b37fd1a3b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 2 Dec 2023 19:49:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/product/ProductRepository.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 245e4a64..c809b8d5 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/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;
     }