推送

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/AdminFeignService.java

@@ -193,6 +193,12 @@ public interface AdminFeignService {
     @GetMapping("/task/sendPlatformAuditMessage")
     HttpResponseResult<Object> sendPlatformAuditMessage();
 
+    /**
+     * 机构学生训练教材过期
+     */
+    @GetMapping("/task/sendTenantAlbumMessage")
+    HttpResponseResult<Object> sendTenantAlbumMessage();
+
 
     @PostMapping(value = "/open/im/register")
     ImUserInfo register(@RequestParam("userId") String userId, @RequestParam("clientType") String clientType, @RequestParam("username") String username, @RequestParam("avatar") String avatar);

cooleshow-api/src/main/java/com/yonge/cooleshow/api/feign/fallback/AdminFeignServiceFallback.java

@@ -188,6 +188,11 @@ public class AdminFeignServiceFallback implements AdminFeignService {
     }
 
     @Override
+    public HttpResponseResult<Object> sendTenantAlbumMessage() {
+        return null;
+    }
+
+    @Override
     public ImUserInfo register(String userId, String clientType, String username, String avatar) {
         return null;
     }

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

@@ -60,9 +60,7 @@ import java.io.OutputStream;
 import java.text.MessageFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 
 @Slf4j
@@ -180,6 +178,9 @@ public class TenantActivationCodeController extends BaseController {
         if (!update) {
             throw new BizException("激活码已经激活");
         }
+        Map<Long, String> receivers = new HashMap<>(1);
+        receivers.put(activationCode.getId(), activationCode.getActivationPhone());
+        tenantActivationCodeService.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
         return succeed();
     }
 

cooleshow-task/src/main/java/com/yonge/cooleshow/task/jobs/SendTenantAlbumMessageTask.java

@@ -0,0 +1,19 @@
+package com.yonge.cooleshow.task.jobs;
+
+import com.yonge.cooleshow.api.feign.AdminFeignService;
+import com.yonge.cooleshow.task.core.BaseTask;
+import com.yonge.cooleshow.task.core.TaskException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SendTenantAlbumMessageTask extends BaseTask {
+
+    @Autowired
+    private AdminFeignService adminFeignService;
+
+    @Override
+    public void execute() throws TaskException {
+        Object o = adminFeignService.sendTenantAlbumMessage();
+    }
+}

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

@@ -121,15 +121,15 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     // 平台审核提醒
     PLATFORM_AUDIT_UNBIND("平台审核提醒"),
-    TENANT_VIP_BUY("机构学生购买会员"),
-    TENANT_VIP_EXPIRE("机构学生会员过期"),
-    TENANT_PLATFORM_ADD_VIP("机构学生会员赠送"),
-    TENANT_ALBUM_BUY("机构学生购买训练教材"),
-    TENANT_ALBUM_EXPIRE("机构学生训练教材过期"),
-    TENANT_SEND_CODE("机构发放激活码"),
+    TENANT_VIP_BUY("开通平台会员"),
+    TENANT_VIP_EXPIRE("平台会员到期"),
+    TENANT_PLATFORM_ADD_VIP("后台添加平台会员"),
+    TENANT_ALBUM_BUY("购买训练教程"),
+    TENANT_ALBUM_EXPIRE("训练教程到期"),
+    TENANT_SEND_CODE("发放激活码"),
     TENANT_CODE_SENDCANCEL("激活码被撤回"),
-    TENANT_MUSIC_BUY("机构学生购买乐谱"),
-    TENANT_STUDENT_CHANGE("学生机构变更"),
+    TENANT_MUSIC_BUY("购买曲目"),
+    TENANT_STUDENT_CHANGE("机构变更"),
     ;
 
     MessageTypeEnum(String msg) {

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

@@ -11,6 +11,7 @@ import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.toolset.utils.easyexcel.ExcelDataReaderProperty;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 机构激活码
@@ -55,6 +56,8 @@ public interface TenantActivationCodeService extends IService<TenantActivationCo
     void sendActivationCode(Long tenantId, Long tenantAlbumPurchaseId, List<String> activationCodeList,
                             List<Long> studentIdList);
 
+    void sendCancelActivationCodeMessage(Map<Long, String> receivers, String tenantName);
+
     void active(String activationCode, Long studentId);
 
 

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

@@ -1,32 +1,21 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alipay.api.domain.NextUrl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
 import com.yonge.cooleshow.biz.dal.dao.StudentDao;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
-import com.yonge.cooleshow.biz.dal.entity.Student;
-import com.yonge.cooleshow.biz.dal.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.entity.TenantActivationCode;
-import com.yonge.cooleshow.biz.dal.entity.TenantAlbumPurchase;
-import com.yonge.cooleshow.biz.dal.entity.TenantInfo;
-import com.yonge.cooleshow.biz.dal.entity.UserTenantAlbumRecord;
+import com.yonge.cooleshow.biz.dal.entity.*;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.im.EImSendStatus;
 import com.yonge.cooleshow.biz.dal.mapper.SysUserMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantActivationCodeMapper;
 import com.yonge.cooleshow.biz.dal.mapper.TenantAlbumPurchaseMapper;
 import com.yonge.cooleshow.biz.dal.mapper.UserTenantAlbumRecordMapper;
-import com.yonge.cooleshow.biz.dal.service.SysMessageService;
-import com.yonge.cooleshow.biz.dal.service.TenantActivationCodeService;
-import com.yonge.cooleshow.biz.dal.service.TenantAlbumService;
+import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.biz.dal.vo.UserOrderDetailVo;
 import com.yonge.cooleshow.biz.dal.wrapper.TenantActivationCodeWrapper;
@@ -49,7 +38,6 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 /**
  * 机构激活码
@@ -72,7 +60,7 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
     private UserTenantAlbumRecordMapper userTenantAlbumRecordMapper;
 
     @Autowired
-    private TenantAlbumService tenantAlbumService;
+    private TenantInfoService tenantInfoService;
 
     @Autowired
     private SysMessageService sysMessageService;
@@ -194,11 +182,8 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         }
     }
 
-
-    private void sendCancelActivationCodeMessage(Long userId,String phone,String tenantName) {
-
-        Map<Long, String> receivers = new HashMap<>();
-        receivers.put(userId, phone);
+    @Override
+    public void sendCancelActivationCodeMessage(Map<Long, String> receivers, String tenantName) {
         try {
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.TENANT_CODE_SENDCANCEL,
                     receivers, null, 0, null, ClientEnum.TENANT_STUDENT.getCode(),tenantName);
@@ -339,6 +324,11 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
         }
         one.setActivationPhone(sysUser.getPhone());
         this.updateById(one);
+        TenantInfo tenantInfo = tenantInfoService.getById(tenantId);
+        Map<Long, String> receivers = new HashMap<>(1);
+        receivers.put(userId, sysUser.getPhone());
+        this.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
+        this.sendActivationCodeMessage(userId,sysUser.getPhone());
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -364,7 +354,9 @@ 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));
+        this.sendCancelActivationCodeMessage(receivers,tenantInfo.getName());
     }
 
     @Transactional(rollbackFor = Exception.class)