diff --git a/app/common/dao/store/StoreActivityUserDao.php b/app/common/dao/store/StoreActivityUserDao.php index 2f72d398..1ac8f667 100644 --- a/app/common/dao/store/StoreActivityUserDao.php +++ b/app/common/dao/store/StoreActivityUserDao.php @@ -116,12 +116,12 @@ class StoreActivityUserDao extends BaseDao ->where('activity_id', $activityId) ->where('status', StoreActivityOrder::STATUS_VALID) ->find(); - if (empty($myOrder)) { + $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray(); + if (empty($myOrder)||empty($myOrder['total_amount'])) { return ['target' => $target, 'allow_receive' => false, 'user_info' => $userInfo]; } $storeConsumptionUserDao = new StoreConsumptionUserDao(); $scope = $storeConsumptionUserDao->getScope($consumption, $myOrder['total_amount']); - $userInfo = User::where('spread_uid', $userId)->field('uid,nickname,avatar')->select()->toArray(); $orders = StoreActivityOrder::where('spread_id', $userId) ->whereIn('user_id', array_column($userInfo, 'uid')) ->where('activity_id', $activityId) diff --git a/app/common/dao/store/consumption/StoreConsumptionDao.php b/app/common/dao/store/consumption/StoreConsumptionDao.php index 5e375f1e..bc4b3162 100644 --- a/app/common/dao/store/consumption/StoreConsumptionDao.php +++ b/app/common/dao/store/consumption/StoreConsumptionDao.php @@ -25,7 +25,15 @@ class StoreConsumptionDao extends BaseDao */ public function getValidList() { - return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE)->field('coupon_id,start_time,end_time,title')->select(); + return StoreConsumption::whereIn('type', [StoreConsumption::TYPE_OWNER_CONSUMPTION, StoreConsumption::TYPE_PULL_CONSUMPTION])->where('status', StoreConsumption::STATUS_ENABLE) + ->field('coupon_id,start_time,end_time,title')->select()->each(function ($item){ + if($item['title']=='无门槛实物通用红包'){ + $item['title'] = '用户推荐拉新活动'; + }else{ + $item['title'] = '用户消费补贴活动'; + } + return $item; + }); } public function getOne($id) diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php index 8c16a1b3..5eacd8c5 100644 --- a/app/common/repositories/user/UserRepository.php +++ b/app/common/repositories/user/UserRepository.php @@ -673,6 +673,10 @@ class UserRepository extends BaseRepository ]; if($code){ $data['promotion_code']=$code; + $shop=explode('shop_',$code); + if(count($shop)==2){ + $data['spread_uid']=$shop[1]; + } Cache::delete('promote_'.$ip); } return $this->create($user_type, $data);