|
|
@@ -111,7 +111,7 @@ class ActivityReward extends BaseController
|
|
|
'status' => ActivityRewardModel::STATUS_UP,
|
|
|
'id' => $activityId
|
|
|
]);
|
|
|
- if (!$activity) throw new Exception('活动不存在', HttpStatus::CUSTOM_ERROR);
|
|
|
+ if (!$activity) throw new Exception('活动不存在或不在活动时间内', HttpStatus::CUSTOM_ERROR);
|
|
|
|
|
|
ActivityUserService::submit([
|
|
|
'activity_id' => $activityId,
|
|
|
@@ -142,7 +142,7 @@ class ActivityReward extends BaseController
|
|
|
$memberId = request()->input('member_id');
|
|
|
$time = time();
|
|
|
$query = ActivityRewardModel::where(ActivityRewardService::getWhere([
|
|
|
- 'start_time' => ['<=', $time],
|
|
|
+// 'start_time' => ['<=', $time],
|
|
|
'end_time' => ['>=', $time],
|
|
|
'status' => ActivityRewardModel::STATUS_UP
|
|
|
]));
|