From af04c1e26948a0201afdf34defe7148f63a05e48 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 19 Apr 2024 18:36:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E8=BF=9B=E8=B4=A7?=
 =?UTF-8?q?=E5=90=8E=E8=A7=84=E6=A0=BC=E8=AE=BE=E7=BD=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=B6=88=E5=A4=B1=EF=BC=8C=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/product/ProductRepository.php            | 14 +++++++++++---
 .../store/product/WineProductRepository.php        |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 03c5a86..5341ca7 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -602,7 +602,7 @@ class ProductRepository extends BaseRepository
      * @param int $productId
      * @return mixed
      */
-    public function setAttrValue(array $data, int $productId, int $productType, int $isUpdate = 0)
+    public function setAttrValue(array $data, int $productId, int $productType, int $isUpdate = 0, int $isWith = 0)
     {
         $extension_status = systemConfig('extension_status');
         if ($isUpdate) {
@@ -663,8 +663,16 @@ class ProductRepository extends BaseRepository
                 ];
 
                 // 如果已经存在规格唯一键
-                if(isset($value['unique']) && $value['unique'] !== '') $array['copy_unique'] = $value['unique'];
-                if(isset($value['value_id']) && $value['value_id'] !== '') $array['copy_value_id'] = $value['value_id'];
+                // if(isset($value['unique']) && $value['unique'] !== '' && isset($value['copy_unique']) && $value['copy_unique'] !== '') $array['copy_unique'] = $value['unique'];
+                // if(isset($value['value_id']) && $value['value_id'] !== '' && isset($value['copy_value_id']) && $value['copy_value_id'] !== '') $array['copy_value_id'] = $value['value_id'];
+
+                if($isWith){
+                    $array['copy_unique'] = $value['unique'];
+                    $array['copy_value_id'] = $value['value_id'];
+                }else{
+                    $array['copy_unique'] = $value['copy_unique'];
+                    $array['copy_value_id'] = $value['copy_value_id'];
+                }
 
 
                 if (isset($data['type']) && $data['type'] == 2) {
diff --git a/app/common/repositories/store/product/WineProductRepository.php b/app/common/repositories/store/product/WineProductRepository.php
index dffb780..f6344e3 100644
--- a/app/common/repositories/store/product/WineProductRepository.php
+++ b/app/common/repositories/store/product/WineProductRepository.php
@@ -127,7 +127,7 @@ class WineProductRepository extends BaseRepository{
         // 处理商品添加
         return Db::transaction(function () use ($item, $productInfo, $oldGood, $hasAttrValue) {
             // 规格处理
-            $settleParams = app()->make(ProductRepository::class)->setAttrValue($oldGood, $productInfo->product_id, $oldGood['product_type'], 0);
+            $settleParams = app()->make(ProductRepository::class)->setAttrValue($oldGood, $productInfo->product_id, $oldGood['product_type'], 0, 1);
             $attr = app()->make(ProductRepository::class)->setAttr($oldGood['attr'], $productInfo->product_id);
             // 修改规格
             $productAttrRepository = app()->make(ProductAttrRepository::class);