liujunchi 3 роки тому
батько
коміт
c04b7d5056

+ 1 - 1
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/ActivityRewardService.java

@@ -81,5 +81,5 @@ public interface ActivityRewardService extends IService<ActivityReward>  {
 	 */
 	IPage<ActivityRewardChangeStockVo> selectChangeStockPage(IPage<ActivityRewardChangeStockVo> page, ActivityRewardChangeStockSearch query);
 
-	void sendReward(Long userId, Long activityId);
+	List<Long> sendReward(Long userId, Long activityId);
 }

+ 5 - 2
cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityRewardServiceImpl.java

@@ -152,11 +152,11 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void sendReward(Long userId, Long activityId) {
+    public List<Long> sendReward(Long userId, Long activityId) {
         ActivityPlan activityPlan = activityPlanService.getById(activityId);
         if (activityPlan == null) {
             log.warn("活动不存在");
-            return;
+            return null;
         }
 
         List<ActivityReward> activityRewardList = getActivityReward(activityId);
@@ -171,6 +171,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
 
         RedissonMultiLock lock = new RedissonMultiLock(lockList.toArray(new RLock[lockList.size()]));
 
+        List<Long> activityRewardIdList = new ArrayList<>();
         try {
             lock.lock();
             for (ActivityReward activityReward : activityRewardList) {
@@ -192,6 +193,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 }
 
                 activityRewardName.append(activityReward.getRewardName());
+                activityRewardIdList.add(activityReward.getId());
             }
             // 发送活动获奖推送
             if (!StringUtil.isEmpty(activityRewardName)) {
@@ -202,6 +204,7 @@ public class ActivityRewardServiceImpl extends ServiceImpl<ActivityRewardDao, Ac
                 lock.unlock();
         }
 
+        return activityRewardIdList;
     }
 
     /**