diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java index 3c07b4272..8f8fd30f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgModel.java @@ -3,6 +3,7 @@ package com.iformall.domain.po; import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.sms.EnumSMSChannel; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -35,17 +36,17 @@ public class WxMsgModel extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="通道模板code",name="modelCode") private String modelCode; - public Integer calcuteContentSize(int perSize) { - if (StringUtils.isBlank(content) || perSize <= 0 ) { + public Integer calcuteContentSize(EnumSMSChannel smsChannel) { + if (StringUtils.isBlank(content) || smsChannel.getPerSize() <= 0 ) { return 1; } - StringBuffer sendContent = new StringBuffer("【").append(signature).append("】").append(content).append("回T退订"); - if (sendContent.length() <= perSize) { + StringBuilder sendContent = new StringBuilder("【").append(signature).append("】").append(content).append(smsChannel.getSuffix()); + if (sendContent.length() <= smsChannel.getPerSize()) { return 1; } - int count = sendContent.length() / perSize; - int countSize = count * perSize; + int count = sendContent.length() / smsChannel.getPerSize(); + int countSize = count * smsChannel.getPerSize(); if (countSize < sendContent.length()) { return count+1; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 1e4b8c95d..5ab585800 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -351,7 +351,7 @@ public class WxMsgServiceImpl implements WxMsgService { private Integer calcuteMsgCount(WxMsgModel wxMsgModel,EnumSMSChannel smsChannel) { if (null != smsChannel.getPerSize() && smsChannel.getPerSize() > 0 ) { - return wxMsgModel.calcuteContentSize(smsChannel.getPerSize()); + return wxMsgModel.calcuteContentSize(smsChannel); } return 1; }