mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调试红包活动

Browse Source
This commit is contained in:
luofei 2024-01-20 10:43:36 +08:00
parent 55966ff40d
commit 2aba6a6d81
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/dao/store/StoreActivityOrderDao.php
View File

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

4
app/common/dao/store/consumption/StoreConsumptionDao.php
View File

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

2
app/common/dao/store/consumption/StoreConsumptionUserDao.php
View File

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