From eb30849646d43239cd7cdcabb3bc209b1bbb2dda Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 26 Jan 2024 11:37:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/StoreActivityDao.php                   | 4 +++-
 app/common/repositories/store/product/ProductRepository.php | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/store/StoreActivityDao.php b/app/common/dao/store/StoreActivityDao.php
index 7e269c1b..4f007afb 100755
--- a/app/common/dao/store/StoreActivityDao.php
+++ b/app/common/dao/store/StoreActivityDao.php
@@ -95,7 +95,9 @@ class StoreActivityDao extends BaseDao
                         if (isset($oldProductList[$v['product']['old_product_id']])) {
                             $list[$k]['product']['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
                             $list[$k]['stock'] = $oldProductList[$v['product']['old_product_id']]['stock'];
-                            $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage;
+                            if ($list[$k]['stock'] < 1) {
+                                $list[$k]['product']['image'] = $list[$k]['product']->sellOutImage;
+                            }
                         }
                     }
                     if ($value['product_id'] == $v['product_id']) {
diff --git a/app/common/repositories/store/product/ProductRepository.php b/app/common/repositories/store/product/ProductRepository.php
index e3fa3f76..6302f1f2 100755
--- a/app/common/repositories/store/product/ProductRepository.php
+++ b/app/common/repositories/store/product/ProductRepository.php
@@ -1290,7 +1290,6 @@ class ProductRepository extends BaseRepository
         $sku  = $this->detailAttrValue($attrValue, $userInfo, $productType, $activityId);
         if ($activityId == 2 && isset($oldProduct['stock'])) {
             $res['stock'] = $oldProduct['stock'];
-            $res['slider_image'] = $res->sellOutImage;
             foreach ($sku as &$skuItem) {
                 $skuItem['stock'] = $oldProduct['stock'];
             }

From f4933fa33c7d49ea6a0435ec8b0fa2a07f86abfe Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Fri, 26 Jan 2024 11:40:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
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 4f285909..4e0997b2 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['source']=[0,2,103];
+            $wheres['source']=[0,2,103,105];
         }else{
             $wheres['activity_type']=0;
         }