Procházet zdrojové kódy

发送邮件优化

anderx před 1 rokem
rodič
revize
ab64580f11

+ 12 - 6
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -59,7 +59,6 @@ public class EmailBo {
 	 * @param amount
 	 * @param date
 	 */
-
 	public  EmailBo(String subject, String address, String addressee,
 			String deptname, String sender,String patentName,String patentNo,String amount,Date date) {
 		this.subject = subject;
@@ -99,8 +98,8 @@ public class EmailBo {
 		this.deptname = deptname;
 		this.sender = sender;
 		if(type==0)this.content = setGeneralFormat();
-		if(type==1)this.content=setDunFormat( addressee, sender, deptname,orderNo,contractNo, date , dunStatusName,adminName,userName,0);
-		if(type==2)this.content=setDunFormat( addressee, sender, deptname,orderNo,contractNo, date , dunStatusName,adminName,userName,1);
+		if(type==1)this.content=setDunFormat(  sender, deptname,orderNo,contractNo, date , dunStatusName,adminName,userName,0);
+		if(type==2)this.content=setDunFormat(  sender, deptname,orderNo,contractNo, date , dunStatusName,adminName,userName,1);
 	}
 
 	/**
@@ -121,8 +120,14 @@ public class EmailBo {
 		this.content = setGeneralFormat();
 	}
 
-	public  EmailBo(String subject, String address, String deptname, String sender,
-			 String orderNo,String adminName) {
+	/**
+	 *
+	 * @param subject
+	 * @param address
+	 * @param deptname
+	 * @param sender
+	 */
+	public  EmailBo(String subject, String address, String deptname, String sender) {
 		this.subject = subject;
 		this.address = address;
 		this.addressee = "";
@@ -133,6 +138,7 @@ public class EmailBo {
 	}
 
 	/**
+	 * 标准模版
 	 * 最新通用模版
 	 * @param subject 标题
 	 * @param address 邮件地址
@@ -203,7 +209,7 @@ public class EmailBo {
 	}
 
 
-	public String setDunFormat(String addressee,String sender,String deptname,String orderNo,String contractNo,String date ,String dunStatusName,String adminName,
+	public String setDunFormat(String sender,String deptname,String orderNo,String contractNo,String date ,String dunStatusName,String adminName,
 			String userName,int i) {
 		String str1 = "",str2= "",str3= "";
 		if (i==0) str1="催收时间";str2="催收科目";str3="催收状态";

+ 1 - 1
src/main/java/com/goafanti/common/task/OrderDunTask.java

@@ -160,7 +160,7 @@ public class OrderDunTask {
 			//校准
 			calibrationDun();
 	} catch (Exception e) {
-  			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", devName+"催款处理失败");
+  			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL, "平台",  "超管");
   			asyncUtils.send(emailBo);
 			LoggerUtils.error(getClass(), "===================新催款的信息处理失败======================", e);
 		}

+ 1 - 1
src/main/java/com/goafanti/common/task/ReleaseUserTask.java

@@ -268,7 +268,7 @@ public class ReleaseUserTask {
 			Notice n = new Notice(UUID.randomUUID().toString(), new Date(), 0, "1",
 					NoticeStatus.TASK_PATENT_ERROR.getCode(), "==============客户释放失败================",null);
 			addNotice(n);
-			EmailBo emailBo = new EmailBo("释放客户失败", AFTConstants.ADMIN_EMAIL, "超管", "平台", "系统", devName+"释放客户失败");
+			EmailBo emailBo = new EmailBo("释放客户失败", AFTConstants.ADMIN_EMAIL, "平台", "超管");
 			asyncUtils.send(emailBo);
 			LoggerUtils.error(getClass(), "====================客户释放失败=================");
 			LoggerUtils.error(getClass(), "客户释放失败", e);

+ 1 - 3
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -150,10 +150,8 @@ public class AsyncUtils {
 
 	public void send(EmailBo bo){
 		try {
-
 			if (bo.getAddress()==null){
-				LoggerUtils.debug(getClass(),String.format("====================" +
-						"邮件发送失败,发送地址={%s}",bo.getAddress()));
+				LoggerUtils.debug(getClass(),"邮件发送失败,发送地址不纯在");
 			}else {
 				SendEmailUtil.getInstance().send(bo);
 				LoggerUtils.debug(getClass(),String.format("====================" +

+ 3 - 3
src/main/java/com/goafanti/order/service/impl/FundManagerOrderServiceImpl.java

@@ -355,7 +355,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			content += "<div>订单编号: "+ o.getOrderNo() +"</div>";
 			if(StringUtils.isNotBlank(o.getEmail())){
 
-				EmailBo emailBo = new EmailBo("同意退单", o.getEmail(), o.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
+				EmailBo emailBo = new EmailBo("同意退单", o.getEmail(), a.getDepartmentName(), o.getSalesmanName());
 				asyncUtils.send(emailBo);
 
 			}
@@ -368,7 +368,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 					//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),tOrderTask.getTaskReceiver());//给技术员
 					//发邮件给技术员
 					if(StringUtils.isNotBlank(tOrderTask.getEmail())){
-						EmailBo emailBo = new EmailBo("同意退单", tOrderTask.getEmail(), tOrderTask.getName(), a.getDepartmentName(), a.getName(), content);
+						EmailBo emailBo = new EmailBo("同意退单", tOrderTask.getEmail(), a.getDepartmentName(), tOrderTask.getName());
 						asyncUtils.send(emailBo);
 					}
 				}
@@ -388,7 +388,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				String sale = o.getSalesmanName();
 				sale = sale.substring(0,sale.indexOf(","));
 				if(email.matches("[\\w\\.\\-]+@([\\w\\-]+\\.)+[\\w\\-]+")){//email格式校验
-					EmailBo emailBo = new EmailBo("拒绝退单",email, sale, a.getDepartmentName(), a.getName(), content);
+					EmailBo emailBo = new EmailBo("拒绝退单",email, a.getDepartmentName(), sale);
 					asyncUtils.send(emailBo);
 				}
 			}

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -2133,7 +2133,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				tite="催收通知";
 			}
 			//发送驳回邮件
-			EmailBo bo = new EmailBo(tite, b.getEmail(), b.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
+			EmailBo bo = new EmailBo(tite, b.getEmail(), a.getDepartmentName(), b.getSalesmanName());
 			if(StringUtils.isNotBlank(b.getEmail())) {
 				asyncUtils.send(bo);
 			}

+ 1 - 2
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -548,8 +548,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+in.getOrderNo()+
 				",客户名称:"+in.getBuyerName()+", 操作人:"+a.getName()+"-"+a.getDepartmentName()+"。";
 		Notice n =new Notice();
-		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), a.getEmail(), a.getDepartmentName(), a.getName(),
-				in.getOrderNo(), in.getSalesmanName());
+		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), a.getEmail(), a.getDepartmentName(), a.getName());
 		n.setId(UUID.randomUUID().toString());
 		if (type==NoticeStatus.PAYMENT_NODE.getCode()||type==NoticeStatus.PAYMENT_NODE.getCode()) {
 			n.setAid(in.getFinanceId());

+ 24 - 0
src/main/java/com/goafanti/test/controller/TestController.java

@@ -0,0 +1,24 @@
+package com.goafanti.test.controller;
+
+import com.goafanti.common.bo.EmailBo;
+import com.goafanti.common.constant.AFTConstants;
+import com.goafanti.common.utils.AsyncUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping(value = "/open")
+public class TestController {
+
+    @Resource
+    private AsyncUtils asyncUtils;
+
+    @GetMapping(value = "/test")
+    public String test(){
+        asyncUtils.send(new EmailBo("催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台"));
+        return "test";
+    }
+}