|
|
@@ -786,9 +786,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
Integer noticType=NoticeStatus.ORDER_DUN.getCode();
|
|
|
if (type==1){
|
|
|
noticType=NoticeStatus.MENBER_DUN.getCode();
|
|
|
- sb=sb.append("[").append(b.getUserName()).append("]催款截点将于").append(o.getCustomizeTimes()).append("进行催款,会员项目请提前2个月催款,以免延误会员派单");
|
|
|
+ sb=sb.append("客户名称【").append(b.getUserName()).append("】催款截点将于").append(o.getCustomizeTimes()).append("进行催款,会员项目请提前2个月催款,以免延误会员派单");
|
|
|
}else {
|
|
|
- sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
|
|
|
+ sb=sb.append("客户名称【").append(b.getUserName()).append("】,按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
|
|
|
}
|
|
|
addNotic(noticType, b,sb.toString());
|
|
|
try {
|
|
|
@@ -1193,10 +1193,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
public void addNotic(Integer type, TOrderNewBo b,String str) {
|
|
|
String aid=null;
|
|
|
StringBuffer sb=new StringBuffer();
|
|
|
+ //预设值 默认发给营销员
|
|
|
+ aid=b.getSalesmanId();
|
|
|
if (str==null){
|
|
|
- if (type==NoticeStatus.ORDER_ARREARS_DUN.getCode()||type==NoticeStatus.PAYMENT_DUN.getCode()||type==NoticeStatus.ORDER_DUN.getCode()){
|
|
|
- sb=sb.append("客户名称[").append(b.getUserName()).append("],按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
|
|
|
- aid=b.getSalesmanId();
|
|
|
+ if (type==NoticeStatus.ORDER_ARREARS_DUN.getCode()||type==NoticeStatus.PAYMENT_DUN.getCode()||
|
|
|
+ type==NoticeStatus.ORDER_DUN.getCode()||type==NoticeStatus.MENBER_DUN.getCode()){
|
|
|
+ sb=sb.append("客户名称【").append(b.getUserName()).append("】,按时触发应收款欠款,请按时催款,并及时增减项目,以免项目延期等问题。");
|
|
|
}
|
|
|
}else {
|
|
|
sb=sb.append(str);
|
|
|
@@ -1234,10 +1236,21 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (admins!=null&&admins.size()>0){
|
|
|
for (Admin admin : admins) {
|
|
|
addNotic(type,admin.getId(),sb.toString());
|
|
|
+ sendMemberEmail(type,admin.getId(),sb.toString());
|
|
|
}
|
|
|
}else {
|
|
|
addNotic(type,aid,sb.toString());
|
|
|
+ sendMemberEmail(type,aid,sb.toString());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ private void sendMemberEmail(Integer type,String aid,String content) {
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
+ EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), admin.getEmail(),content);
|
|
|
+ if(StringUtils.isNotBlank(admin.getEmail())) {
|
|
|
+ asyncUtils.send(bo);
|
|
|
}
|
|
|
+ LoggerUtils.debug(logger, "=========================================发送邮件成功");
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1248,7 +1261,6 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
* @param str 信息
|
|
|
*/
|
|
|
public void addNotic(Integer type, String aid,String str) {
|
|
|
-
|
|
|
Notice n =new Notice();
|
|
|
n.setId(UUID.randomUUID().toString());
|
|
|
n.setAid(aid);
|