|
|
@@ -295,7 +295,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();
|
|
|
- pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t.getApproval());
|
|
|
}
|
|
|
if (t2.getApproval()==ApprovalNewState.BH.getCode()||
|
|
|
t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
|
|
|
@@ -478,7 +478,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,
|
|
|
+ public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer approval,
|
|
|
Integer distribution,String depId,String contractNo,Integer outsource,Integer liquidationStatus, Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
if(pageSize==null||pageSize<0)pageSize=10;
|
|
|
@@ -498,6 +498,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
|
|
|
if (StringUtils.isNotBlank(contractNo)) params.put("contractNo", contractNo);
|
|
|
if (null!=liquidationStatus) params.put("liquidationStatus", liquidationStatus);
|
|
|
+ if (null!=approval)params.put("approval", approval);
|
|
|
if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
|
|
|
if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
|
|
|
if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
|
|
|
@@ -572,7 +573,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
t.setOrderStatus(orderStatus);
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
- pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
@@ -628,7 +629,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
//发送驳回邮件
|
|
|
if(SendEmailUtil.isEmail(b.getEmail())) {
|
|
|
EmailBo bo = new EmailBo("催收通知", b.getEmail(), a.getDepartmentName(), a.getName(),
|
|
|
- "", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1);
|
|
|
+ "", orderNo,new SimpleDateFormat("yyyy-MM-dd").format(ob.getCreateTime()),dunTypeName,a2.getName(),b.getUserName(),1,0);
|
|
|
if(StringUtils.isNotBlank(b.getEmail())) {
|
|
|
SendEmailUtil.getInstance().patentSend(bo);
|
|
|
}
|
|
|
@@ -771,7 +772,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
type=NoticeStatus.ORDER_APPROVA_NO.getCode();
|
|
|
}
|
|
|
addOrderLog(tl);
|
|
|
- pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId(),t2.getApproval());
|
|
|
//新增特批催款信息
|
|
|
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
@@ -1036,7 +1037,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
addBackOrder(orderNo, reason);
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
aids.add(t.getSalesmanId());
|
|
|
- pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, NoticeStatus.ORDER_NO.getCode(),t.getOrderNo(), TokenManager.getAdminId(),t.getApproval());
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|
|
|
@@ -1128,9 +1129,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
|
|
|
@Async
|
|
|
- public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String OrderNo,String adminId) {
|
|
|
+ public void pushGeneralSendNoticeAndEmail(List<String> alist, Integer type,String orderNo,String adminId,Integer approval) {
|
|
|
AdminListBo a = adminMapper.getDeptNameByAid(adminId);
|
|
|
- String str=NoticeStatus.getValueByCode(type)+": 订单编号 -"+OrderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
|
|
|
+ String approvalType="";
|
|
|
+ if (approval!=ApprovalNewState.FTP.getCode()) approvalType="[特批]";
|
|
|
+ String str=approvalType+NoticeStatus.getValueByCode(type)+": 订单编号 -"+orderNo+", 操作人:"+a.getDepartmentName()+"-"+a.getName()+"。";
|
|
|
String adminIds="";
|
|
|
List<Notice> nlist=new ArrayList<>();
|
|
|
for (String string : alist) {
|
|
|
@@ -1149,7 +1152,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
if(StringUtils.isNotBlank(adminIds)) {
|
|
|
adminIds=adminIds.substring(0, adminIds.length()-1);
|
|
|
EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), adminIds, a.getDepartmentName(), a.getName(), "请登录查看"
|
|
|
- ,null,null,null,null,null,0);
|
|
|
+ ,null,null,null,null,null,0,approval);
|
|
|
try {
|
|
|
//使用专利邮件模板
|
|
|
SendEmailUtil.getInstance().patentSend(bo);
|
|
|
@@ -1225,5 +1228,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
}
|