From 76ae26ff00642557112b9a5b3cf87924df8b7735 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 21 Feb 2024 09:24:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A2=84=E5=94=AE=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreGroupOrderRepository.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index fb6d1db9..1225179e 100755
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -67,7 +67,7 @@ class StoreGroupOrderRepository extends BaseRepository
     {
         $query = StoreGroupOrder::getDB()->alias('StoreGroupOrder');
         if(isset($where['source']) && $where['source'] == 103){
-            $wheres['activity_type']=[0,98];
+            $wheres['activity_type']=[0, 2, 98];
             $wheres['source']=[0,2,103,105];
         }else{
             $wheres['activity_type']=0;

From 49461d5efd4732a85a80b80fb2c753ad62e612ad Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 21 Feb 2024 10:28:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E4=BC=98?=
 =?UTF-8?q?=E7=89=B9=E4=BA=A7=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/product/StoreSpu.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controller/api/store/product/StoreSpu.php b/app/controller/api/store/product/StoreSpu.php
index 1cdd3481..ad0f7c72 100755
--- a/app/controller/api/store/product/StoreSpu.php
+++ b/app/controller/api/store/product/StoreSpu.php
@@ -69,6 +69,7 @@ class StoreSpu extends BaseController
         if (isset($where['type_code']) && $where['type_code'] == 'PersonalStore') {
             $where['long'] = '';
             $where['lat'] = '';
+            $where['type_id'] = 21;
         } else {
             [$lat, $lng] = (new CityAreaDao())->getLngAndLat($where['location'], $where['street_id']);
             $where['long'] = $lng;