|
|
@@ -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="";
|