团队成员

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -269,9 +269,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         if (CollectionUtils.isEmpty(data)) {
             return userCouponPag;
         }
-        Map<Integer, AppUserLogin> userIdAndAppuserLoginMap = null;
-        if (Objects.nonNull(userCouponFindDTO.getPhone())) {
-            List<Integer> userIds = data.stream().map(UserCouponDTO::getUserId).collect(Collectors.toList());
+        Map<Integer, AppUserLogin> userIdAndAppuserLoginMap = new HashMap<>();
+        if (StringUtils.isEmpty(userCouponFindDTO.getPhone())) {
+            List<Integer> userIds = data.stream().map(UserCouponDTO::getUserId).distinct().collect(Collectors.toList());
             userIdAndAppuserLoginMap = userFeign.findAppUsersByUserIds(userIds);
         }
         List<UserCouponPageVo> userCouponPageVos = new ArrayList<>();
@@ -282,7 +282,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             if (Objects.nonNull(userCouponFindDTO.getPhone())) {
                 userCouponPageVo.setPhone(userCouponFindDTO.getPhone());
             } else {
-                userCouponPageVo.setPhone(userIdAndAppuserLoginMap == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()) == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()).getUsername());
+                userCouponPageVo.setPhone(userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()) == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()).getUsername());
             }
             userCouponPageVos.add(userCouponPageVo);
         }
@@ -347,4 +347,11 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         userInfoDTO.setCouponNumber(couponNumber);
         return  userInfoDTO;
     }
+
+    public void deleteByUserIds(List<Integer> userIds) {
+        Example example = new Example(UserCoupon.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/DateController.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.activity.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.biz.ActivityPopularizeUserBiz;
+import com.xxfc.platform.activity.biz.UserCouponBiz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,9 +24,13 @@ public class DateController {
         @Autowired
         private ActivityPopularizeUserBiz activityPopularizeUserBiz;
 
+        private UserCouponBiz  userCouponBiz;
+
+
       @GetMapping("/clear")
       public ObjectRestResponse<Void> clearDate(@RequestParam(value = "userIds") List<Integer>  userIds){
           activityPopularizeUserBiz.deleteByUserIds(userIds);
+          userCouponBiz.deleteByUserIds(userIds);
           return ObjectRestResponse.succ();
       }
 }