Merge branch 'develop-new' of http://git.dayaedu.com/yonge/cooleshow into test

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantActivationCodeController.java

@@ -172,7 +172,7 @@ public class TenantActivationCodeController extends BaseController {
             throw new BizException("激活码已经激活");
         }
         Map<Long, String> receivers = new HashMap<>(1);
-        receivers.put(activationCode.getId(), activationCode.getActivationPhone());
+        receivers.put(activationCode.getId(), activationCode.getId().toString());
         tenantActivationCodeService.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
         return succeed();
     }

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

@@ -131,7 +131,7 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
         UserVipInfoVo userVipInfoVo = getUserVipInfoVo(vipCardRecord);
         //会员购买消息推送
         if (messageFlag) {
-            authSend(userVipInfoVo.getUserId(), userVipInfoVo.getPhone(), DateUtil.format(vipCardRecord.getEndTime(), DateUtil.DEFAULT_PATTERN), orderDetailVo.getOrderClient());
+            authSend(userVipInfoVo.getUserId(), DateUtil.format(vipCardRecord.getEndTime(), DateUtil.DEFAULT_PATTERN), orderDetailVo.getOrderClient());
         }
     }
 
@@ -298,15 +298,8 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
 
     private void sendAddVipMessage(Long userId, ClientEnum client, Integer times, PeriodEnum type, String reason) {
         try {
-            SysUser user = sysUserFeignService.queryUserById(userId);
-
-            if (user == null) {
-                return;
-            }
-
             Map<Long, String> receivers = new HashMap<>();
-            receivers.put(userId, user.getPhone());
-
+            receivers.put(userId, userId.toString());
             Student student = studentService.getById(userId);
             if (client.equals(ClientEnum.STUDENT) && student != null && student.getTenantId() != null && student.getTenantId() >0) {
                 try {
@@ -350,9 +343,9 @@ public class MemberPriceSettingsServiceImpl extends ServiceImpl<MemberPriceSetti
 
 
     // 发送会员购买消息推送
-    private void authSend(Long userId, String phone, String param1,ClientEnum clientEnum) {
+    private void authSend(Long userId, String param1,ClientEnum clientEnum) {
         Map<Long, String> receivers = new HashMap<>();
-        receivers.put(userId, phone);
+        receivers.put(userId, userId.toString());
 
         // 判断是否是机构学生 机构学生推送走另一个
         Student student = studentService.getById(userId);

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

@@ -1190,8 +1190,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
         }
         // 推送学生
-        Map<Long, String> studentReceivers = new HashMap<>();
-        studentReceivers.put(studentId, student.getPhone());
+        Map<Long, String> studentReceivers = new HashMap<>(1);
+        studentReceivers.put(studentId, studentId.toString());
 
         try {
             Student studentInfo = studentService.getById(studentId);

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

@@ -6,18 +6,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.api.feign.dto.ImUserInfo;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.microsvc.toolkit.common.webportal.exception.BizException;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.config.CustomerServiceConfig;
-import com.yonge.cooleshow.biz.dal.dao.EmployeeDao;
-import com.yonge.cooleshow.biz.dal.dao.StudentDao;
-import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
-import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
-import com.yonge.cooleshow.biz.dal.dao.UserBindingTeacherDao;
+import com.yonge.cooleshow.biz.dal.dao.*;
 import com.yonge.cooleshow.biz.dal.dto.search.QueryMyFollowSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.*;
@@ -26,11 +21,9 @@ import com.yonge.cooleshow.biz.dal.enums.ImGroupMemberRoleType;
 import com.yonge.cooleshow.biz.dal.enums.ImGroupType;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
-import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumMapper;
-import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumPurchaseMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumRefMapper;
-import com.yonge.cooleshow.biz.dal.service.ImGroupService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.service.im.ImGroupCoreService;
 import com.yonge.cooleshow.biz.dal.vo.MyFollow;
 import com.yonge.cooleshow.biz.dal.vo.StudentHomeVo;
@@ -577,10 +570,6 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
         if (student.getTenantId() == null || student.getTenantId() == -1) {
             return;
         }
-        SysUser sysUser = sysUserFeignService.queryUserById(student.getUserId());
-        if (sysUser == null) {
-            return;
-        }
         TenantInfo tenantInfo = tenantInfoService.getById(student.getTenantId());
         if (tenantInfo == null) {
             return;
@@ -590,7 +579,7 @@ public class StudentServiceImpl extends ServiceImpl<StudentDao, Student> impleme
             return;
         }
         Map<Long, String> receivers = new HashMap<>();
-        receivers.put(sysUser.getId(), sysUser.getPhone());
+        receivers.put(student.getUserId(), student.getUserId().toString());
         try {
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TENANT_STUDENT_CHANGE,
                     receivers, null, 0, null, ClientEnum.TENANT_STUDENT.getCode(),tenantInfo.getName(),newTenantInfo.getName());

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

@@ -173,7 +173,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
     private void sendActivationCodeMessage(Long userId,String phone) {
 
         Map<Long, String> receivers = new HashMap<>();
-        receivers.put(userId, phone);
+        receivers.put(userId, userId.toString());
         try {
             String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TENANT_SEND_CODE.getCode());
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TENANT_SEND_CODE,
@@ -327,7 +327,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         this.updateById(one);
         TenantInfo tenantInfo = tenantInfoService.getById(tenantId);
         Map<Long, String> receivers = new HashMap<>(1);
-        receivers.put(userId, sysUser.getPhone());
+        receivers.put(userId, userId.toString());
         this.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
         this.sendActivationCodeMessage(userId,sysUser.getPhone());
     }
@@ -355,8 +355,8 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
                 .eq(TenantActivationCode::getSendStatus, EActivationCode.SEND)
                 .eq(TenantActivationCode::getTenantId,tenantInfo.getId())
                 .update();
-        //获取优惠券关联的学员编号和手机号map
-        Map<Long, String> receivers = sysUserMapper.selectBatchIds(idList).stream().collect(Collectors.toMap(SysUser::getId, SysUser::getPhone));
+        //转换map
+        Map<Long, String> receivers = idList.stream().collect(Collectors.toMap(Function.identity(), String::valueOf));
         this.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
     }
 

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

@@ -358,11 +358,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
 
     private void sendMsg(UserOrderDetailVo userOrderDetailVo) {
         try {
-            SysUser user = sysUserFeignService.queryUserById(userOrderDetailVo.getUserId());
-
-            if (user == null) {
-                return;
-            }
+            Long userId = userOrderDetailVo.getUserId();
 
             // 查询机构专辑信息
             TenantAlbum tenantAlbum = tenantAlbumService.getById(userOrderDetailVo.getBizId());
@@ -372,7 +368,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
 
             // 查询学生当前机构有效时间
             UserTenantAlbumRecord albumRecord = userTenantAlbumRecordService
-                    .getNewestByTenantAlbumId(tenantAlbum.getId(), user.getId(), userOrderDetailVo.getOrderClient());
+                    .getNewestByTenantAlbumId(tenantAlbum.getId(), userId, userOrderDetailVo.getOrderClient());
             if (albumRecord == null) {
                 return;
             }
@@ -380,10 +376,10 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
 
 
             Map<Long, String> receivers = new HashMap<>();
-            receivers.put(user.getId(), user.getPhone());
+            receivers.put(userId, userId.toString());
 
             if (userOrderDetailVo.getOrderClient().equals(ClientEnum.STUDENT)) {
-                Student student = studentService.getById(user.getId());
+                Student student = studentService.getById(userId);
                 if (student.getTenantId() != null && student.getTenantId() >0) {
                     try {
                         String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TENANT_ALBUM_BUY.getCode(),userOrderDetailVo.getOrderNo());

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

@@ -435,7 +435,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
             }
             temporaryFlagMap.put(record.getUserId(), record.getUserId());
             //发送消息
-            CompletableFuture.runAsync(() -> temporarySend(record.getUserId(), record.getPhone(),record.getClientType(),record.getTenantAlbumId()));
+            CompletableFuture.runAsync(() -> temporarySend(record.getUserId(), record.getTenantAlbumId()));
             UserTenantAlbumRecord userTenantAlbumRecord = new UserTenantAlbumRecord();
             userTenantAlbumRecord.setMsgStatus(true);
             userTenantAlbumRecord.setUpdateTime(new Date());
@@ -459,19 +459,13 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
     }
 
 
-    private void temporarySend(Long userId, String phone, ClientEnum clientType, Long tenantAlbumId) {
-
-        SysUser sysUser = sysUserFeignService.queryUserById(userId);
-        if (null == sysUser) {
-            return;
-        }
+    private void temporarySend(Long userId,Long tenantAlbumId) {
         TenantAlbum tenantAlbum = tenantAlbumService.getById(tenantAlbumId);
         if (tenantAlbum == null) {
             return;
         }
-
         Map<Long, String> receivers = new HashMap<>();
-        receivers.put(userId, phone);
+        receivers.put(userId, userId.toString());
 
         try {
             String url = sysMessageService.selectConfigUrl(MessageTypeEnum.TENANT_ALBUM_EXPIRE.getCode());

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

@@ -209,7 +209,7 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
             //发送消息
             //发送消息
             CompletableFuture.runAsync(() -> {
-                expireSend(record.getUserId(), record.getPhone(), record.getClientType());
+                expireSend(record.getUserId(), record.getClientType());
             });
             record.setMsgStatus(2);
             record.setUpdateTime(new Date());
@@ -254,9 +254,9 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
     }
 
     // 发送会员到期消息推送
-    private void expireSend(Long userId, String phone,ClientEnum userType) {
+    private void expireSend(Long userId,ClientEnum userType) {
         Map<Long, String> receivers = new HashMap<>();
-        receivers.put(userId, phone);
+        receivers.put(userId, userId.toString());
         Student student = studentService.getById(userId);
         if (userType.equals(ClientEnum.STUDENT) && student != null  && student.getTenantId() != null && student.getTenantId() >0) {
             try {