diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php index 0c803590..4da6b6d1 100644 --- a/app/common/dao/store/StoreActivityUserDao.php +++ b/app/common/dao/store/StoreActivityUserDao.php @@ -97,7 +97,7 @@ class StoreActivityUserDao extends BaseDao ->where('status', 1) ->find()->toArray(); 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']) ->where('type', StoreConsumption::TYPE_PULL_CONSUMPTION) @@ -107,7 +107,7 @@ class StoreActivityUserDao extends BaseDao ->where('status', StoreActivityOrder::STATUS_VALID) ->find()->toArray(); if (empty($myOrder)) { - return ['target' => $target, 'allow_receive' => false, 'userInfo' => $userInfo]; + return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo]; } $storeConsumptionUserDao = new StoreConsumptionUserDao(); $storeConsumptionUserDao->consumption = $consumption; @@ -122,9 +122,10 @@ class StoreActivityUserDao extends BaseDao ->select()->toArray(); $orders = reset_index($orders, 'user_id'); foreach ($userInfo as &$user) { + $user['target_amount'] = $scope['start']; $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]; } /** diff --git a/app/controller/api/store/StoreActivity.php b/app/controller/api/store/StoreActivity.php index e7ff5665..4a08f14c 100644 --- a/app/controller/api/store/StoreActivity.php +++ b/app/controller/api/store/StoreActivity.php @@ -51,7 +51,7 @@ class StoreActivity extends BaseController $userId = $this->request->uid(); $activityId = $this->request->post('activity_id', 1); $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(); $result = $dao->receive($userId); - return app('json')->status('success', '领取成功', $result); + return app('json')->success($result); } } \ No newline at end of file