From 0771bef93a8e12f81d76654e49c79e8882f4d2cb Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Thu, 7 Mar 2024 16:26:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=A5=E8=80=95=E8=A1=A5?=
 =?UTF-8?q?=E8=B4=B4=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/listens/ActivateConsumptionListen.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crmeb/listens/ActivateConsumptionListen.php b/crmeb/listens/ActivateConsumptionListen.php
index a4f22625..d496b22b 100644
--- a/crmeb/listens/ActivateConsumptionListen.php
+++ b/crmeb/listens/ActivateConsumptionListen.php
@@ -20,23 +20,28 @@ class ActivateConsumptionListen extends TimerService implements ListenerInterfac
     {
         $this->tick(1000 * 60, function () {
             Log::info('定时任务：激活商户补贴');
+            $count = 0;
             $couponId = StoreConsumption::where('type', StoreConsumption::TYPE_RECHARGE)->value('coupon_id');
             if (empty($couponId)) {
                 return;
             }
+            $buyCouponId = StoreConsumption::where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)->value('coupon_id');
             $storeConsumptionUser = StoreConsumptionUser::where('coupon_id', $couponId)
                 ->where('status', StoreConsumptionUser::STATUS_REPEAL)
                 ->select();
             foreach ($storeConsumptionUser as $item) {
                 $saleTotal = Merchant::where('uid', $item['uid'])->value('sale_amount');
-                if ($saleTotal >= $item['order_amount'] && $item['balance'] <= 0) {
+                $balance = StoreConsumptionUser::where('coupon_id', $buyCouponId)->where('uid', $item['uid'])->value('balance');
+                if ($saleTotal >= $item['order_amount'] && $balance <= 0) {
                     $item->status = StoreConsumptionUser::STATUS_UNUSED;
                     $item->start_time = date('Y-m-d H:i:s');
                     $item->end_time = date('Y-m-d H:i:s', strtotime('+1 year'));
                     $item->save();
                     UserBill::where('link_id', $item['coupon_user_id'])->where('type', 'red_pack_2')->update(['status', 1]);
+                    $count++;
                 }
             }
+            Log::info('定时任务：激活商户补贴，执行数量：' . $count);
         });
     }