Forráskód Böngészése

开发完批量标记与发邮件

anderx 4 éve%!(EXTRA string=óta)
szülő
commit
066433a3d6

+ 1 - 2
src/main/java/com/goafanti/common/bo/EmailBo.java

@@ -1,6 +1,5 @@
 package com.goafanti.common.bo;
 
-import java.math.BigDecimal;
 
 public class EmailBo {
 	
@@ -346,7 +345,7 @@ public class EmailBo {
 				"		            \r\n" + 
 				"		        <table width=\"800\" border=\"0\" align=\"left\" cellpadding=\"0\" cellspacing=\"0\" style=\" border:1px solid #edecec; border-top:none; padding:0 20px;font-size:14px;color:#333333;\">\r\n" + 
 				"	               		<tbody><tr>\r\n" + 
-				"                <td width=\"760\" height=\"56\" border=\"0\" align=\"left\" colspan=\"2\" style=\" font-size:16px;vertical-align:bottom;\">尊敬的" + userName + ":</td>\r\n" + 
+				"                <td width=\"760\" height=\"56\" border=\"0\" align=\"left\" colspan=\"2\" style=\" font-size:16px;vertical-align:bottom;\">尊敬的客户 " + userName + ":</td>\r\n" + 
 				"              </tr>\r\n" + 
 				"               <tr>\r\n" + 
 				"                <td width=\"760\" height=\"30\" border=\"0\" align=\"left\" colspan=\"2\" style=\"text-indent: 2em\">您好!</td>\r\n" + 

+ 3 - 2
src/main/java/com/goafanti/common/dao/PatentNewMapper.java

@@ -59,10 +59,11 @@ public interface PatentNewMapper {
 
 	List<PatentNew> selectByYear(int i);
 
-	void updateBatch(@Param("list") String[] list);
+	void updateBatch(@Param("list") List<String> list);
 
 
-	List<PatentNew> selectByids(String[] s);
+	List<PatentNew> selectByids(List<String> s);
 
 	String selectUserNameByTid(Integer tid);
+
 }

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

@@ -141,11 +141,7 @@ public class OrderDunTask {
   		
   		} catch (Exception e) {
   			EmailBo emailBo = new EmailBo( "催款处理失败",  AFTConstants.ADMIN_EMAIL,  "超管", "平台",  "系统", devName+"催款处理失败");
-			try {
-				asyncUtils.send(emailBo);
-			} catch (UnsupportedEncodingException | MessagingException e1) {
-				e1.printStackTrace();
-			}
+  			asyncUtils.send(emailBo);
   			LoggerUtils.error(getClass(), "=============================================");
 			LoggerUtils.error(getClass(), "新催款的信息处理失败", e);
 			LoggerUtils.error(getClass(), "=============================================");

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

@@ -1,13 +1,11 @@
 package com.goafanti.common.task;
 
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 
 import javax.annotation.Resource;
-import javax.mail.MessagingException;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -195,11 +193,7 @@ public class ReleaseUserTask {
 					NoticeStatus.TASK_PATENT_ERROR.getCode(), "==============客户释放失败================",null);
 			addNotice(n);
 			EmailBo emailBo = new EmailBo("释放客户失败", AFTConstants.ADMIN_EMAIL, "超管", "平台", "系统", devName+"释放客户失败");
-			try {
-				asyncUtils.send(emailBo);
-			} catch (UnsupportedEncodingException | MessagingException e1) {
-				e1.printStackTrace();
-			}
+			asyncUtils.send(emailBo);
 			LoggerUtils.error(getClass(), "====================客户释放失败=================");
 			LoggerUtils.error(getClass(), "客户释放失败", e);
 		}

+ 13 - 9
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -20,8 +20,7 @@ import com.goafanti.common.model.Notice;
 public class AsyncUtils {
 	@Autowired
 	private NoticeMapper noticeMapper;
-	@Autowired
-	private SendEmailUtil sendEmailUtil;
+	
 	
 
 	
@@ -31,18 +30,23 @@ public class AsyncUtils {
 	
 	public void sendList(List<EmailBo> list) {
 		for (EmailBo emailBo : list) {
-			try {
-				sendEmailUtil.patentSend(emailBo);
-			} catch (UnsupportedEncodingException | MessagingException e) {
-				e.printStackTrace();
-			}
+				try {
+					SendEmailUtil.getInstance().patentSend(emailBo);
+				} catch (UnsupportedEncodingException | MessagingException e) {
+					// TODO Auto-generated catch block
+					e.printStackTrace();
+				}
 		}
 		
 	}
 	
 	
-	public void send(EmailBo bo) throws UnsupportedEncodingException, MessagingException {
-		sendEmailUtil.send(bo);
+	public void send(EmailBo bo){
+		try {
+			SendEmailUtil.getInstance().send(bo);
+		} catch (UnsupportedEncodingException | MessagingException e) {
+			e.printStackTrace();
+		}
 	}
 	
 	public void addNotice(Notice n ) {

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

@@ -1,6 +1,5 @@
 package com.goafanti.order.service.impl;
 
-import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -10,7 +9,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.mail.MessagingException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -351,13 +349,8 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			if(StringUtils.isNotBlank(o.getEmail())){
 				
 				EmailBo emailBo = new EmailBo("同意退单", o.getEmail(), o.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
-				try {
-					asyncUtils.send(emailBo);
-				} catch (UnsupportedEncodingException e) {
-					e.printStackTrace();
-				} catch (MessagingException e) {
-					e.printStackTrace();
-				}
+				asyncUtils.send(emailBo);
+				
 			}
 			//发送站内消息
 			//addNotic(o.getOrderNo(),NoticeStatus.ORDER_REFUND.getCode(),o.getSalesmanId());//给营销员
@@ -369,13 +362,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 					//发邮件给技术员
 					if(StringUtils.isNotBlank(tOrderTask.getEmail())){
 						EmailBo emailBo = new EmailBo("同意退单", tOrderTask.getEmail(), tOrderTask.getName(), a.getDepartmentName(), a.getName(), content);
-						try {
-							asyncUtils.send(emailBo);
-						} catch (UnsupportedEncodingException e) {
-							e.printStackTrace();
-						} catch (MessagingException e) {
-							e.printStackTrace();
-						}
+						asyncUtils.send(emailBo);
 					}
 				}
 			}
@@ -395,13 +382,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 				sale = sale.substring(0,sale.indexOf(","));
 				if(email.matches("[\\w\\.\\-]+@([\\w\\-]+\\.)+[\\w\\-]+")){//email格式校验
 					EmailBo emailBo = new EmailBo("拒绝退单",email, sale, a.getDepartmentName(), a.getName(), content);
-					try {
-						asyncUtils.send(emailBo);
-					} catch (UnsupportedEncodingException e) {
-						e.printStackTrace();
-					} catch (MessagingException e) {
-						e.printStackTrace();
-					}
+					asyncUtils.send(emailBo);
 				}
 			}
 		}

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

@@ -1,6 +1,5 @@
 package com.goafanti.organization.service.impl;
 
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -11,14 +10,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.mail.MessagingException;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import com.goafanti.admin.bo.AdminListBo;
@@ -532,11 +529,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		n.setReaded(0);//未读
 		asyncUtils.addNotice(n);
 		if(StringUtils.isNotBlank(a.getEmail())) {
-			try {
-				asyncUtils.send(bo);
-			} catch (UnsupportedEncodingException | MessagingException e) {
-				e.printStackTrace();
-			}
+			asyncUtils.send(bo);
 		}
 	}
 

+ 1 - 1
src/main/java/com/goafanti/patent/controller/AdminPatentNewApiController.java

@@ -189,7 +189,7 @@ public class AdminPatentNewApiController extends CertifyApiController {
      * @param type 0 标记已通知 1批量发邮件
      * @return
      */
-    @RequestMapping(value = "/updateBatch",method = RequestMethod.GET)
+    @RequestMapping(value = "/updateBatch",method = RequestMethod.POST)
     public Result updateBatch(String ids,Integer type) {
     	Result res =new Result();
     	if (ids==null) {

+ 6 - 3
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -3,6 +3,7 @@ package com.goafanti.patent.service.impl;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -376,20 +377,22 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 	@Override
 	public Object updateBatch(String ids, Integer type) {
 		String [] s=ids.split(",");
+		List<String> ls=Arrays.asList(s);
 		if(type==1) {
 			List<EmailBo>list =new ArrayList<EmailBo>();
-			List<PatentNew> lp=patentNewMapper.selectByids(s);
+			List<PatentNew> lp=patentNewMapper.selectByids(ls);
 			for (PatentNew patentNew : lp) {
 				Admin a = adminMapper.selectByPrimaryKey(patentNew.getAid());
 				String userName=patentNewMapper.selectUserNameByTid(patentNew.getTid());
+				BigDecimal amout= patentNew.getPatentAmount().multiply(new BigDecimal(1000));
 				EmailBo emailBo = new EmailBo("专利提醒", patentNew.getEmail().trim(), userName, "科德集团", a.getName(),
-						patentNew.getName(), patentNew.getPatentNo(), patentNew.getPatentAmount().toEngineeringString(),
+						patentNew.getName(), patentNew.getPatentNo(),amout.stripTrailingZeros().toPlainString(),
 						DateFormatUtils.format(patentNew.getEndDate(), "yyyy-MM-dd"), patentNew.getStatus());
 				list.add(emailBo);
 			}
 			asyncUtils.sendList(list);
 		}
-		patentNewMapper.updateBatch(s);
+		patentNewMapper.updateBatch(ls);
 		return 1;
 	}
 }

+ 1 - 7
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1,6 +1,5 @@
 package com.goafanti.weChat.service.impl;
 
-import java.io.UnsupportedEncodingException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.HashMap;
@@ -8,7 +7,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.mail.MessagingException;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -137,11 +135,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		else if (type==2) title="外出申请同意提醒";
 		if (SendEmailUtil.isEmail(a.getEmail())) {
 			EmailBo email=new EmailBo(title,a.getEmail() , my.getDepartmentName(), my.getName(),"详情请登录微信打卡小程序查看,谢谢!") ;
-			try {
-				asyncUtils.send(email);
-			} catch (UnsupportedEncodingException | MessagingException e) {
-				e.printStackTrace();
-			}
+			asyncUtils.send(email);
 		}
 	}