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-19 11:08:52 +08:00
parent 8d9c4d847a
commit 92da0baa39
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/common/dao/store/StoreActivityUserDao.php
View File

@ -97,7 +97,7 @@ class StoreActivityUserDao extends BaseDao
->where('status', 1) ->where('status', 1)
->find()->toArray(); ->find()->toArray();
if (empty($activityUser)) { if (empty($activityUser)) {
return ['target' => $target, 'allow_receive' => false, 'userInfo' => $userInfo]; return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo];
} }
$consumption = StoreConsumption::where('coupon_id', $activityUser['value']) $consumption = StoreConsumption::where('coupon_id', $activityUser['value'])
->where('type', StoreConsumption::TYPE_PULL_CONSUMPTION) ->where('type', StoreConsumption::TYPE_PULL_CONSUMPTION)
@ -107,7 +107,7 @@ class StoreActivityUserDao extends BaseDao
->where('status', StoreActivityOrder::STATUS_VALID) ->where('status', StoreActivityOrder::STATUS_VALID)
->find()->toArray(); ->find()->toArray();
if (empty($myOrder)) { if (empty($myOrder)) {
return ['target' => $target, 'allow_receive' => false, 'userInfo' => $userInfo]; return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo];
} }
$storeConsumptionUserDao = new StoreConsumptionUserDao(); $storeConsumptionUserDao = new StoreConsumptionUserDao();
$storeConsumptionUserDao->consumption = $consumption; $storeConsumptionUserDao->consumption = $consumption;
@ -122,9 +122,10 @@ class StoreActivityUserDao extends BaseDao
->select()->toArray(); ->select()->toArray();
$orders = reset_index($orders, 'user_id'); $orders = reset_index($orders, 'user_id');
foreach ($userInfo as &$user) { foreach ($userInfo as &$user) {
$user['target_amount'] = $scope['start'];
$user['is_finish'] = isset($orders[$user['uid']]) ? 1 : 0; $user['is_finish'] = isset($orders[$user['uid']]) ? 1 : 0;
} }
return ['target' => $scope['num'], 'allow_receive' => count($orders) >= $scope['num'], 'userInfo' => $userInfo]; return ['target' => $scope['num'], 'allow_receive' => count($orders) >= $scope['num'], 'user_info' => $userInfo];
} }
/** /**

4
app/controller/api/store/StoreActivity.php
View File

@ -51,7 +51,7 @@ class StoreActivity extends BaseController
$userId = $this->request->uid(); $userId = $this->request->uid();
$activityId = $this->request->post('activity_id', 1); $activityId = $this->request->post('activity_id', 1);
$result = $dao->status($userId, $activityId); $result = $dao->status($userId, $activityId);
return app('json')->status('success', '获取成功', $result); return app('json')->success($result);
} }
/** /**
@ -66,7 +66,7 @@ class StoreActivity extends BaseController
{ {
$userId = $this->request->uid(); $userId = $this->request->uid();
$result = $dao->receive($userId); $result = $dao->receive($userId);
return app('json')->status('success', '领取成功', $result); return app('json')->success($result);
} }
} }