修复老师编号匹配，使用昵称提示

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/MK.java

@@ -7,7 +7,7 @@ package com.yonge.cooleshow.biz.dal.enums;
 public interface MK {
 
     // 手机号
-    String EXP_MOBILE_NUMBER = "^\\d{3,11}$";
+    String EXP_MOBILE_NUMBER = "^1(3\\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$";
     // 正型
     String EXP_INT = "^\\d+$";
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityPlanServiceImpl.java

@@ -211,11 +211,11 @@ public class ActivityPlanServiceImpl extends ServiceImpl<ActivityPlanDao, Activi
                     if (CollectionUtils.isNotEmpty(wrapper.getRecords())) {
 
                         String collect = wrapper.getRecords().stream().map(x -> {
-                            if (StringUtils.isNotEmpty(x.getRealName())) {
-                                return x.getRealName();
+                            if (StringUtils.isNotEmpty(x.getUsername())) {
+                                return x.getUsername();
                             }
-                            return x.getUsername();
-                        }).collect(Collectors.joining("、"));
+                            return x.getRealName();
+                        }).distinct().collect(Collectors.joining("、"));
 
                         throw new BizException("以下老师存在时间冲突:" + collect);
                     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ActivityUserRewardServiceImpl.java

@@ -44,7 +44,7 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
         // 活动信息
         ActivityPlan activityPlan = activityPlanService.getBaseMapper().selectById(query.getActivityId());
         if (Objects.isNull(activityPlan)) {
-            throw  new BizException("无效的活动ID");
+            throw new BizException("无效的活动ID");
         }
 
         // 活动获奖用户信息
@@ -63,6 +63,7 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
             Lists.partition(userIds, 30).parallelStream().forEach(item -> {
 
                 List<UserRewardVo> retlist = getBaseMapper().selectActivityShareTeacher(activityPlan.getId(), item);
+
                 // 同一个活动，用户关联多个老师信息
                 Map<Long, String> collect = retlist.stream()
                         .collect(Collectors.groupingBy(UserRewardVo::getUserId, Collectors.mapping(x -> {
@@ -71,14 +72,16 @@ public class ActivityUserRewardServiceImpl extends ServiceImpl<ActivityUserRewar
                                 return x.getRealName();
                             }
                             return x.getUsername();
-                        }, Collectors.joining("、"))));
+                        }, Collectors.toSet()))).entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey, x -> String.join("、", x.getValue())));
 
                 teacherNameMap.putAll(collect);
 
                 // 老师ID
                 teacherIdMap.putAll(retlist.stream()
                         .collect(Collectors.groupingBy(UserRewardVo::getUserId,
-                                Collectors.mapping(UserRewardVo::getTeacherId, Collectors.joining("、")))));
+                                Collectors.mapping(UserRewardVo::getTeacherId, Collectors.toSet()))).entrySet().stream()
+                        .collect(Collectors.toMap(Map.Entry::getKey, x -> String.join("、", x.getValue()))));
 
             });