Browse Source

财务审核修改

anderx 2 years ago
parent
commit
516341f408

+ 20 - 2
src/main/java/com/goafanti/common/utils/AsyncUtils.java

@@ -119,9 +119,27 @@ public class AsyncUtils {
 		SendEmailUtil.getInstance().patentSend(bo);
 	}
 
-	public void sendList(List<EmailBo> list) throws MessagingException, UnsupportedEncodingException {
-		for (EmailBo emailBo : list) {
+	public void patentSend(List<EmailBo> list) {
+		try {
+			for (EmailBo emailBo : list) {
 					SendEmailUtil.getInstance().patentSend(emailBo);
+			}
+		} catch (MessagingException e) {
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public void sendList(List<EmailBo> list) {
+		try {
+			for (EmailBo emailBo : list) {
+				SendEmailUtil.getInstance().send(emailBo);
+			}
+		} catch (MessagingException e) {
+			e.printStackTrace();
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
 		}
 	}
 

+ 14 - 6
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1518,10 +1518,20 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 			aid=b.getSalesmanId();
 		}
 		if (admins!=null&&admins.size()>0){
+			List<EmailBo> list =new ArrayList<>();
+			List<Notice> notices=new ArrayList<>();
 			for (Admin admin : admins) {
-				asyncUtils.addNotic(type,admin.getId(),sb.toString());
-				sendMemberEmail(type,admin.getId(),sb.toString());
+				list.add(sendMemberEmail(type,admin.getId(),sb.toString()));
+				Notice n = new Notice();
+				n.setId(UUID.randomUUID().toString());
+				n.setAid(aid);
+				n.setNoticeType(type);
+				n.setContent(sb.toString());
+				n.setReaded(0);//未读
+				notices.add(n);
 			}
+			asyncUtils.sendList(list);
+			asyncUtils.addNoticeBatch(notices);
 		}else {
 			asyncUtils.addNotic(type,aid,sb.toString());
 			sendMemberEmail(type,aid,sb.toString());
@@ -1583,12 +1593,10 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	 * @param aid
 	 * @param content
 	 */
-	private void sendMemberEmail(Integer type,String aid,String content) {
+	private EmailBo sendMemberEmail(Integer type,String aid,String content) {
 		Admin admin = adminMapper.selectByPrimaryKey(aid);
 		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), admin.getEmail(),content);
-		if(com.goafanti.common.utils.StringUtils.isNotBlank(admin.getEmail())) {
-			asyncUtils.send(bo);
-		}
+		return bo;
 	}
 
 	@Override

+ 1 - 7
src/main/java/com/goafanti/patent/service/impl/PatentNewServiceImpl.java

@@ -622,13 +622,7 @@ public class PatentNewServiceImpl  extends BaseMybatisDao<PatentNewMapper> imple
 						patentNew.getEndDate());
 				list.add(emailBo);
 			}
-			try {
-				asyncUtils.sendList(list);
-			} catch (MessagingException e) {
-				e.printStackTrace();
-			} catch (UnsupportedEncodingException e) {
-				e.printStackTrace();
-			}
+				asyncUtils.patentSend(list);
 		}
 		if (type == 0 || type == 1) {
 			patentNewMapper.updateBatch(ls);