Browse Source

修改pushGeneralSendNoticeAndEmail

anderx 6 years ago
parent
commit
13569d7590

+ 1 - 2
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -170,8 +170,7 @@ public interface OrderNewService {
 	int updateFinance(String orderNo, String newFinance);
 	List<TOrderLogBo> selectOrderLog(String orderNo);
 
-	void generalSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId);
-	void sendMailByAsynchronousMode(List<String> alist, Integer type, String orderNo, String id);
+	void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId);
 	
 	
 }

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

@@ -198,7 +198,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 			c = backMapper.insertSelective(back);
 			List<String> aids = new ArrayList<>();
 			aids.add(t.getSalesmanId());;
-			orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+			orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
 		}
 		return c;
 	}
@@ -491,7 +491,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
 		for (Admin admin : adminMapper.getAdminRoleList("咨询师管理员")) {
 			aids.add(admin.getId());
 		}
-		orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -307,7 +307,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		
 		}
 		//发送站内信息与邮件
-		orderNewService.generalSendNoticeAndEmail(alist, type, o.getOrderNo(), a.getId());
+		orderNewService.pushGeneralSendNoticeAndEmail(alist, type, o.getOrderNo(), a.getId());
 		
 	}
 	
@@ -445,7 +445,7 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 		alist.add(o.getSalesmanId());
 		newOrderChangeMapper.updateByPrimaryKeySelective(nb);
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-		orderNewService.generalSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), a.getId());
+		orderNewService.pushGeneralSendNoticeAndEmail(alist,NoticeStatus.ORDER_CHANGE_END.getCode(), o.getOrderNo(), a.getId());
 		return 1;
 	}
 	@Override

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

@@ -80,7 +80,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 				}
 			}
 		}
-		orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_INVPICE_START.getCode(),o.getOrderNo(), TokenManager.getAdminId());
 	}
 
 	@Override
@@ -157,7 +157,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			type=NoticeStatus.ORDER_INVPICE_END.getCode();
 			aids.add(o.getSalesmanId());
 		}
-		orderNewService.generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -212,7 +212,7 @@ public class OrderInvoiceServiceImpl extends BaseMybatisDao<TOrderInvoiceMapper>
 			}
 		
 		}
-		orderNewService.generalSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids,type,o.getOrderNo(), TokenManager.getAdminId());
 		return tOrderInvoiceMapper.updateByPrimaryKeySelective(t);
 	}
 

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

@@ -255,7 +255,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 			aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
 			type=NoticeStatus.ORDER_START.getCode();
-			generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+			pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		}
 		if (t2.getApproval()==ApprovalNewState.BH.getCode()||
 				t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
@@ -497,7 +497,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				aids.add(t2.getSalesmanId());
 				type=NoticeStatus.ORDER_NO.getCode();
 		}
-		generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		t.setOrderStatus(orderStatus);
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
@@ -620,7 +620,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			aids.add(t2.getSalesmanId());
 			type=NoticeStatus.ORDER_APPROVA_NO.getCode();
 		}
-		generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -837,7 +837,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		addBackOrder(orderNo, reason);
 		List<String> aids = new ArrayList<>();
 		aids.add(t.getSalesmanId());
-		generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
 		return tOrderNewMapper.updateByPrimaryKeySelective(t);
 	}
 
@@ -928,22 +928,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	}
 
 	
-	/**
-     * 异步发送邮件
-     * 
-     * @param email
-     */
-	@Async
-    public void sendMailByAsynchronousMode(List<String> alist, Integer type,String OrderNo,String adminId){  
-			try {      
-	        	generalSendNoticeAndEmail(alist,  type, OrderNo, adminId);
-	             } catch (Exception e) {    
-         }    
-        
-    }
+
 
     @Async
-	public  void generalSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId) {
+	public  void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId) {
 		AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 		String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+OrderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
 		String adminIds="";

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

@@ -117,7 +117,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		tOrderTaskMapper.updateByPrimaryKey(t);
 		List<String> aids = new ArrayList<>();
 		aids.add(taskReceiverId);
-		orderNewService.generalSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_TASK_TO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
 		updateOrder(t);
 		return 1;
 	}

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

@@ -122,7 +122,7 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 			type=NoticeStatus.ORDER_OUTSOURCE_NO.getCode();
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(t);
-		orderNewService.generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
+		orderNewService.pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
 		return tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
 	}