|
|
@@ -16,6 +16,8 @@ import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
+import java.util.regex.Matcher;
|
|
|
+import java.util.regex.Pattern;
|
|
|
|
|
|
import javax.mail.MessagingException;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
@@ -634,14 +636,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
AdminListBo a2 = adminMapper.getDeptNameByAid(b.getSalesmanId());
|
|
|
//发送驳回邮件
|
|
|
- //String subject, String address, String deptname, String sender,
|
|
|
- //String content , String orderNo,String date ,String dunStatusName,Integer type
|
|
|
- EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
|
|
|
- "", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
|
|
|
- if(StringUtils.isNotBlank(b.getEmail())) {
|
|
|
- SendEmailUtil.getInstance().patentSend(bo);
|
|
|
- }
|
|
|
- LoggerUtils.debug(logger, "=========================================发送邮件成功");
|
|
|
+
|
|
|
+
|
|
|
+ if(SendEmailUtil.isEmail(b.getEmail())) {
|
|
|
+ EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
|
|
|
+ "", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),ob.getDunTypeName(),a2.getName(),b.getUserName(),1);
|
|
|
+ if(StringUtils.isNotBlank(b.getEmail())) {
|
|
|
+ SendEmailUtil.getInstance().patentSend(bo);
|
|
|
+ }
|
|
|
+ LoggerUtils.debug(logger, "=========================================发送邮件成功");
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
}
|
|
|
|
|
|
@@ -1137,7 +1142,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
n.setAid(string);
|
|
|
nlist.add(n);
|
|
|
Admin admin = adminMapper.selectAllByid(string);
|
|
|
- if(admin!=null&&StringUtils.isNotBlank(admin.getEmail()))adminIds+=admin.getEmail()+",";
|
|
|
+ if(admin!=null&&SendEmailUtil.isEmail(admin.getEmail()))adminIds+=admin.getEmail()+",";
|
|
|
}
|
|
|
if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
|
|
|
if(StringUtils.isNotBlank(adminIds)) {
|
|
|
@@ -1152,7 +1157,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
+
|
|
|
|
|
|
|
|
|
|