调试红包活动

app/common/dao/store/StoreActivityOrderDao.php

@@ -15,14 +15,14 @@ class StoreActivityOrderDao extends BaseDao
 
     /**
      * 保存活动订单数据
-     * @param array $groupOrder 订单
+     * @param $groupOrder 订单
      * @param int $spreadId 推荐人id
      * @param int $isFirstOrder 是否首单
      * @param int $activityId 活动id
      * @return void
      * @throws \Exception
      */
-    public function save(array $groupOrder, int $spreadId, int $isFirstOrder, int $activityId = 1)
+    public function save($groupOrder, int $spreadId, int $isFirstOrder, int $activityId = 1)
     {
         $model = new StoreActivityOrder();
         $model->activity_id = $activityId;

app/common/dao/store/consumption/StoreConsumptionDao.php

@@ -32,8 +32,8 @@ class StoreConsumptionDao extends BaseDao
     {
         return StoreConsumption::where('coupon_id', $id)
             ->where('status', StoreConsumption::STATUS_ENABLE)
-            ->whereTime('start_time', '>=', time())
-            ->whereTime('end_time', '<', time())
+            ->whereTime('start_time', '<=', time())
+            ->whereTime('end_time', '>', time())
             ->find();
     }
 

app/common/dao/store/consumption/StoreConsumptionUserDao.php

@@ -57,7 +57,7 @@ class StoreConsumptionUserDao extends BaseDao
         $consumptionId = (new StoreActivityUserDao())->getValue($userId);
         $consumption = (new StoreConsumptionDao())->getOne($consumptionId);
         //用户没有参加 消费金活动
-        if (!empty($consumption['config'])) {
+        if (empty($consumption['config'])) {
             return false;
         }
         $scope = $this->getScope($consumption, $groupOrder['pay_price']);