From 26ed341714e5e57271f42c13952ac3211d4ca74b Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 23 May 2024 14:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=8F=91=E8=B4=A7=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/product/ProductRepository.php | 3 ++-
 app/controller/admin/store/StoreProduct.php                 | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 5f8a4a4..e3774b6 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -541,6 +541,7 @@ class ProductRepository extends BaseRepository
         if (isset($data['param_temp_id'])) $result['param_temp_id'] = $data['param_temp_id'];
         // 省公司及供应商提成
         if (isset($data['agent_two_ids'])) $result['agent_two_ids'] = is_array($data['agent_two_ids']) ? implode(',',$data['agent_two_ids']) : $data['agent_two_ids'];
+        if (isset($data['agent_two_mer_id'])) $result['agent_two_mer_id'] = $data['agent_two_mer_id'];
         if (isset($data['agent_two_money'])) $result['agent_two_money'] = $data['agent_two_money'];
         if (isset($data['supplier_money'])) $result['supplier_money'] = $data['supplier_money'];
 
@@ -1326,7 +1327,7 @@ class ProductRepository extends BaseRepository
 
     public function apiProductDetail($where,int $productType, ?int $activityId, $userInfo = null)
     {
-        $field = 'is_show,product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,video_link,product_type,extension_type,old_product_id,rate,guarantee_template_id,temp_id,once_max_count,pay_limit,once_min_count,integral_rate,delivery_way,delivery_free,type,cate_id,svip_price_type,svip_price,mer_svip_status,agent_two_ids,copy_product_id,supplier_mer_id';
+        $field = 'is_show,product_id,mer_id,image,slider_image,store_name,store_info,unit_name,price,cost,ot_price,stock,sales,video_link,product_type,extension_type,old_product_id,rate,guarantee_template_id,temp_id,once_max_count,pay_limit,once_min_count,integral_rate,delivery_way,delivery_free,type,cate_id,svip_price_type,svip_price,mer_svip_status,agent_two_ids,agent_two_mer_id,copy_product_id,supplier_mer_id';
         $with = [
             'attr',
             'attrValue',
diff --git a/app/controller/admin/store/StoreProduct.php b/app/controller/admin/store/StoreProduct.php
index d596f40..8e10bb6 100644
--- a/app/controller/admin/store/StoreProduct.php
+++ b/app/controller/admin/store/StoreProduct.php
@@ -161,6 +161,7 @@ class StoreProduct extends BaseController
             'rank',
             'star',
             ['agent_two_ids', []],
+            ['agent_two_mer_id', 0],
             'agent_two_money',
             'supplier_money'
         ]);