From 8731844d54294bd519c99feb0b9a4242e9fed8e4 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 19 Jan 2024 15:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=BA=A2=E5=8C=85=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/consumption/StoreConsumptionDao.php    | 6 +++++-
 .../dao/store/consumption/StoreConsumptionUserDao.php       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/common/dao/store/consumption/StoreConsumptionDao.php b/app/common/dao/store/consumption/StoreConsumptionDao.php
index 4a62faac..73b800e3 100644
--- a/app/common/dao/store/consumption/StoreConsumptionDao.php
+++ b/app/common/dao/store/consumption/StoreConsumptionDao.php
@@ -30,7 +30,11 @@ class StoreConsumptionDao extends BaseDao
 
     public function getOne($id)
     {
-        return StoreConsumption::where('coupon_id', $id)->where('status', StoreConsumption::STATUS_ENABLE)->find();
+        return StoreConsumption::where('coupon_id', $id)
+            ->where('status', StoreConsumption::STATUS_ENABLE)
+            ->whereTime('start_time', '>=', time())
+            ->whereTime('end_time', '<', time())
+            ->find();
     }
 
 }
\ No newline at end of file
diff --git a/app/common/dao/store/consumption/StoreConsumptionUserDao.php b/app/common/dao/store/consumption/StoreConsumptionUserDao.php
index a3ce3981..ae5e6564 100644
--- a/app/common/dao/store/consumption/StoreConsumptionUserDao.php
+++ b/app/common/dao/store/consumption/StoreConsumptionUserDao.php
@@ -53,7 +53,7 @@ class StoreConsumptionUserDao extends BaseDao
     public function promoter(int $userId, array $groupOrder, int $spreadUserId)
     {
         $consumptionId = (new StoreActivityUserDao())->getValue($userId);
-        $consumption = StoreConsumption::where('coupon_id', $consumptionId)->where('status', 1)->find();
+        $consumption = (new StoreConsumptionDao())->getOne($consumptionId);
         //用户没有参加 消费金活动
         if (!empty($consumption['config'])) {
             return false;
@@ -93,7 +93,7 @@ class StoreConsumptionUserDao extends BaseDao
     {
         // 查询推荐人的消费金类型
         $spreadConsumptionId = (new StoreActivityUserDao())->getValue($spreadUserId);
-        $spreadConsumption = StoreConsumption::where('coupon_id', $spreadConsumptionId)->where('status', 1)->find();
+        $spreadConsumption = (new StoreConsumptionDao())->getOne($spreadConsumptionId);
         // 查询推荐人满足条件的有效订单
         $spreadGroupOrderId = StoreActivityOrder::where('user_id', $spreadUserId)->where('status', StoreActivityOrder::STATUS_VALID)->value('group_order_id');
         $spreadGroupOrder = StoreGroupOrder::where('group_order_id', $spreadGroupOrderId)->where('paid', 1)->find();