From 637f17726cfaa3a51c9cd80a63651d037b47b682 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 13 Jan 2024 16:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/product/ProductRepository.php            |  2 +-
 .../repositories/store/product/SpuRepository.php   | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index 62ff0849..f889c1ba 100644
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -1351,7 +1351,7 @@ class ProductRepository extends BaseRepository
         if($res['merchant']['type_name']=='个人店铺'){
             $village_name=Db::name('geo_village')->where('village_id',$res['merchant']['village_id'])->value('village_name');
             if($village_name){
-                $res['merchant']['village_name']=$village_name.'的集体店铺';
+                $res['merchant']['village_name']=$village_name.'集体经营合作店铺';
             }
         }
         return $res;
diff --git a/app/common/repositories/store/product/SpuRepository.php b/app/common/repositories/store/product/SpuRepository.php
index 35d36eb9..d7745db0 100644
--- a/app/common/repositories/store/product/SpuRepository.php
+++ b/app/common/repositories/store/product/SpuRepository.php
@@ -34,7 +34,7 @@ use think\facade\Queue;
 class SpuRepository extends BaseRepository
 {
     public $dao;
-    public $merchantFiled = 'mer_id,mer_name,mer_avatar,is_trader,mer_info,mer_keyword,type_id,long,lat,street_id';
+    public $merchantFiled = 'mer_id,mer_name,mer_avatar,is_trader,mer_info,mer_keyword,type_id,long,lat,street_id,village_id';
     public $productFiled  = 'P.bar_code,S.product_id,S.store_name,S.image,activity_id,S.keyword,S.price,S.mer_id,spu_id,S.status,store_info,brand_id,cate_id,unit_name,S.star,S.rank,S.sort,sales,S.product_type,rate,reply_count,extension_type,S.sys_labels,S.mer_labels,P.delivery_way,P.delivery_free,P.ot_price,svip_price_type,stock,mer_svip_status';
 
     public $userInfo;
@@ -162,6 +162,12 @@ class SpuRepository extends BaseRepository
                         $sku  = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo);
                         $item['sku'] = $sku;
                     }
+                    if($item['merchant']['type_name']=='个人店铺'){
+                        $village_name=Db::name('geo_village')->where('village_id',$item['merchant']['village_id'])->value('village_name');
+                        if($village_name){
+                            $item['merchant']['village_name']=$village_name.'集体经营合作店铺';
+                        }
+                    }
                 });
         } else {
             $list = $query->page($page, $limit)->setOption('field', [])->field($this->productFiled)->select()
@@ -170,6 +176,12 @@ class SpuRepository extends BaseRepository
                         $sku  = $productMake->detailAttrValue($item['product']['attrValue'], $userInfo);
                         $item['sku'] = $sku;
                     }
+                    if($item['merchant']['type_name']=='个人店铺'){
+                        $village_name=Db::name('geo_village')->where('village_id',$item['merchant']['village_id'])->value('village_name');
+                        if($village_name){
+                            $item['merchant']['village_name']=$village_name.'集体经营合作店铺';
+                        }
+                    }
                 });
         }