酷乐秀优化

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

@@ -84,6 +84,8 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     DISCOUNT_EXPIRE_THIRTY_DAY("畅学卡到期前3天"),
 
+    TEACHER_VIP_EXPIRE_THIRTY_DAY("VIP会员到期前3天"),
+    TEACHER_SVIP_EXPIRE_THIRTY_DAY("SVIP会员到期前3天"),
     VIP_EXPIRE_THIRTY_DAY("VIP会员到期前3天"),
     SVIP_EXPIRE_THIRTY_DAY("SVIP会员到期前3天"),
     SMS_VIP_EXPIRE_THIRTY_DAY("VIP会员到期前3天(短信)"),
@@ -91,6 +93,9 @@ public enum MessageTypeEnum implements BaseEnum<String, MessageTypeEnum> {
 
     DISCOUNT_EXPIRE("畅学卡到期"),
 
+    TEACHER_VIP_EXPIRE("VIP会员到期"),
+    TEACHER_SVIP_EXPIRE("SVIP会员到期"),
+
     VIP_EXPIRE("VIP会员到期"),
     SVIP_EXPIRE("SVIP会员到期"),
     SMS_VIP_EXPIRE("VIP会员到期(短信)"),

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

@@ -848,8 +848,13 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
     // 发送会员到期3天消息推送
     private void temporary3DaysSend(Map<Long, String> receivers, ClientEnum clientType, EVipType vipType) {
         try {
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    EVipType.VIP.equals(vipType) ? MessageTypeEnum.VIP_EXPIRE_THIRTY_DAY : MessageTypeEnum.SVIP_EXPIRE_THIRTY_DAY
+            MessageTypeEnum messageTypeEnum;
+            if(clientType.equals(ClientEnum.TEACHER)){
+                messageTypeEnum = EVipType.VIP.equals(vipType) ? MessageTypeEnum.TEACHER_VIP_EXPIRE_THIRTY_DAY : MessageTypeEnum.TEACHER_SVIP_EXPIRE_THIRTY_DAY;
+            }else {
+                messageTypeEnum = EVipType.VIP.equals(vipType) ? MessageTypeEnum.VIP_EXPIRE_THIRTY_DAY : MessageTypeEnum.SVIP_EXPIRE_THIRTY_DAY;
+            }
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,messageTypeEnum
                     , receivers, null, 0, null, clientType.getCode());
         } catch (Exception e) {
             log.error("会员到期3天极光消息推送异常");
@@ -859,8 +864,13 @@ public class VipCardRecordServiceImpl extends ServiceImpl<VipCardRecordDao, VipC
     // 发送会员到期消息推送
     private void expireSend(Map<Long, String> receivers,ClientEnum userType, EVipType vipType) {
         try {
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,
-                    EVipType.VIP.equals(vipType) ? MessageTypeEnum.VIP_EXPIRE : MessageTypeEnum.SVIP_EXPIRE
+            MessageTypeEnum messageTypeEnum;
+            if(userType.equals(ClientEnum.TEACHER)){
+                messageTypeEnum = EVipType.VIP.equals(vipType) ? MessageTypeEnum.TEACHER_VIP_EXPIRE : MessageTypeEnum.TEACHER_SVIP_EXPIRE;
+            }else {
+                messageTypeEnum = EVipType.VIP.equals(vipType) ? MessageTypeEnum.VIP_EXPIRE : MessageTypeEnum.SVIP_EXPIRE;
+            }
+            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG,messageTypeEnum
                     ,receivers, null, 0, null, userType.getCode());
         } catch (Exception e) {
             log.error("会员到期极光消息推送异常");