红包业务bug修改

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userCoupon/controller/UserCouponController.java

@@ -58,7 +58,7 @@ public class UserCouponController extends BaseController<UserCoupon, UserCouponQ
         return userCouponService.queryAllPage(request);
     }
 
-    @PostMapping("/couponNum")
+    @GetMapping("/couponNum")
     @ApiOperation(value = "我的卡券红包余额")
     public RestResponse getCouponNum(Long userId) {
         CouponNumResp couponNum = userCouponService.getCouponNum(userId);

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/controller/UserInfoController.java

@@ -199,6 +199,12 @@ public class UserInfoController {
         return userInfoService.batchSendRedEnvelope(redEnvelopRequest.getUserList(), redEnvelopRequest.getRedElvelopId());
     }
 
+    @PostMapping("/batchSendEnvelope")
+    @ApiOperation(value = "批量发卡券")
+    public RestResponse batchSendEnvelope(@RequestBody RedEnvelopRequest redEnvelopRequest) {
+        return userInfoService.batchSendEnvelope(redEnvelopRequest.getUserList(), redEnvelopRequest.getRedElvelopId());
+    }
+
     //todo  测试用
     @PostMapping("/cancelOverTimeVip")
     @ApiOperation(value = "测试-定时任务取消会员")

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/IUserInfoService.java

@@ -121,4 +121,12 @@ public interface IUserInfoService extends IService<UserInfoEntity> {
      * @return
      */
     RestResponse saveVipID(UserInfoEntity entity);
+
+    /**
+     * 批量发卡券
+     * @param userList
+     * @param redElvelopId
+     * @return
+     */
+    RestResponse batchSendEnvelope(List<String> userList, Long redElvelopId);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/userInfo/service/impl/UserInfoServiceImpl.java

@@ -640,22 +640,24 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
 
     @Override
     public RestResponse sendRedEnvelope(Long userId, Long redEncelopId) {
-        UserCoupon uc = new UserCoupon();
-        uc.setUserId(userId);
-        uc.setCouponId(redEncelopId);
-        uc.setUsedFlag(1);
-        boolean save = iUserCouponService.save(uc);
-        if (save) {
-        	//发送消息
-            PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(userId.toString());
-            PushMessage pushMessage = PushMessage.expertGetRedPackgeRemind();
-            pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
-            
-            return RestResponse.success(null, "发放成功");
-        } else {
-            return RestResponse.success(null, "发放失败");
-        }
-
+//        UserCoupon uc = new UserCoupon();
+//        uc.setUserId(userId);
+//        uc.setCouponId(redEncelopId);
+//        uc.setUsedFlag(1);
+//        boolean save = iUserCouponService.save(uc);
+//        if (save) {
+//        	//发送消息
+//            PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(userId.toString());
+//            PushMessage pushMessage = PushMessage.expertGetRedPackgeRemind();
+//            pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
+//
+//            return RestResponse.success(null, "发放成功");
+//        } else {
+//            return RestResponse.success(null, "发放失败");
+//        }
+        List<String> userList = new ArrayList<>();
+        userList.add(userId.toString());
+        return batchSendRedEnvelope(userList,redEncelopId);
     }
 
     /**
@@ -670,6 +672,12 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
         return userByMobile;
     }
 
+    /**
+     * 红包有个数限制，卡券没有个数限制
+     * @param userList
+     * @param redEncelopId
+     * @return
+     */
     @Override
     public RestResponse batchSendRedEnvelope(List<String> userList, Long redEncelopId) {
         Optional<Coupon> couponOptional = Optional.ofNullable(
@@ -1192,4 +1200,27 @@ public class UserInfoServiceImpl extends ServiceImpl<UserInfoMapper, UserInfoEnt
         }
         return RestResponse.fail("vip id添加失败！");
     }
+
+    /**
+     * 批量发卡券，卡券没有数量限制
+     * @param userList
+     * @param redElvelopId
+     * @return
+     */
+    @Override
+    public RestResponse batchSendEnvelope(List<String> userList, Long redElvelopId) {
+        for (String id : userList) {
+            UserCoupon uc = new UserCoupon();
+            uc.setUserId(Long.parseLong(id));
+            uc.setCouponId(redElvelopId);
+            uc.setUsedFlag(1);
+            uc.setCreateBy(CurrentUserInfo.userInfo().getName());
+            iUserCouponService.save(uc);
+            // 推送消息
+            PushUserInfo pushUserInfo = iUserAccountService.getPushUserInfoByUserId(id);
+            PushMessage pushMessage = PushMessage.expertGetRedPackgeRemind();
+            pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfo);
+        }
+        return RestResponse.success(null, "发放成功");
+    }
 }