From c04d4d19d6eaeced6450139728112e181e00c637 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 20:28:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/store/consumption/StoreConsumptionDao.php      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/common/dao/store/consumption/StoreConsumptionDao.php b/app/common/dao/store/consumption/StoreConsumptionDao.php
index 5e375f1e..29ecd6a0 100644
--- a/app/common/dao/store/consumption/StoreConsumptionDao.php
+++ b/app/common/dao/store/consumption/StoreConsumptionDao.php
@@ -25,7 +25,15 @@ class StoreConsumptionDao extends BaseDao
      */
     public function getValidList()
     {
-        return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)->field('coupon_id,start_time,end_time,title')->select();
+        return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)
+        ->field('coupon_id,start_time,end_time,title')->select()->each(function ($item){
+                if($item['title']==['无门槛实物通用红包']){
+                    $item['title'] = '用户推荐拉新活动';
+                }else{
+                    $item['title'] = '用户消费补贴活动';
+                }
+                return $item;
+        });
     }
 
     public function getOne($id)

From d004a8ad16e10b6626bdf5b52d829ec72519897a Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 20:40:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/consumption/StoreConsumptionDao.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/common/dao/store/consumption/StoreConsumptionDao.php b/app/common/dao/store/consumption/StoreConsumptionDao.php
index 29ecd6a0..bc4b3162 100644
--- a/app/common/dao/store/consumption/StoreConsumptionDao.php
+++ b/app/common/dao/store/consumption/StoreConsumptionDao.php
@@ -27,7 +27,7 @@ class StoreConsumptionDao extends BaseDao
     {
         return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)
         ->field('coupon_id,start_time,end_time,title')->select()->each(function ($item){
-                if($item['title']==['无门槛实物通用红包']){
+                if($item['title']=='无门槛实物通用红包'){
                     $item['title'] = '用户推荐拉新活动';
                 }else{
                     $item['title'] = '用户消费补贴活动';

From 1b2aed7a4f43c0cf06efb3ae7a9bcdd6b4ec5fc5 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 20:51:02 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/user/UserRepository.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php
index 8c16a1b3..5eacd8c5 100644
--- a/app/common/repositories/user/UserRepository.php
+++ b/app/common/repositories/user/UserRepository.php
@@ -673,6 +673,10 @@ class UserRepository extends BaseRepository
         ];
         if($code){
             $data['promotion_code']=$code;
+            $shop=explode('shop_',$code);
+            if(count($shop)==2){
+                $data['spread_uid']=$shop[1];
+            }
             Cache::delete('promote_'.$ip);
         }
         return $this->create($user_type, $data);

From 9b07143f00068446b33acf19b4fc2a1aeb3429dd Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 21 Jan 2024 21:09:22 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/StoreActivityUserDao.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php
index 2a99f9d6..0baddc95 100644
--- a/app/common/dao/store/StoreActivityUserDao.php
+++ b/app/common/dao/store/StoreActivityUserDao.php
@@ -116,12 +116,12 @@ class StoreActivityUserDao extends BaseDao
             ->where('activity_id', $activityId)
             ->where('status', StoreActivityOrder::STATUS_VALID)
             ->find();
-        if (empty($myOrder)) {
+        $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray();
+        if (empty($myOrder)||empty($myOrder['total_amount'])) {
             return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo];
         }
         $storeConsumptionUserDao = new StoreConsumptionUserDao();
         $scope = $storeConsumptionUserDao->getScope($consumption, $myOrder['total_amount']);
-        $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray();
         $orders = StoreActivityOrder::where('spread_id', $userId)
             ->whereIn('user_id', array_column($userInfo, 'uid'))
             ->where('activity_id', $activityId)