|
|
@@ -706,16 +706,19 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
tl.setOrderNo(orderNo);
|
|
|
tl.setProcess(OrderLogProcess.YXJLTT.getCode());
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(t2.getOrderNo());
|
|
|
+ Integer noticeType=0;
|
|
|
if (type==0){
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
tl.setProcess(OrderLogProcess.YYBZSHBH.getCode());
|
|
|
aids.add(t.getSalesmanId());
|
|
|
+ noticeType= NoticeStatus.ORDER_NO.getCode();
|
|
|
} else if (type==1) {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
tl.setProcess(OrderLogProcess.YYBZSHTG.getCode());
|
|
|
if (t2.getApproval().equals(ApprovalNewState.TPDSH.getCode())){
|
|
|
str.append(order.getApprovalName()).append(",");
|
|
|
+ aids.add(order.getApprovalAid());
|
|
|
}else if (t2.getApproval().equals(ApprovalNewState.DSZDSH.getCode())){
|
|
|
List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.APPROVAL_DECISION);
|
|
|
admins.forEach(e->{
|
|
|
@@ -724,9 +727,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
});
|
|
|
}
|
|
|
t.setExamineName(str.substring(0,str.length()-1));
|
|
|
+ noticeType= NoticeStatus.ORDER_YES.getCode();
|
|
|
}
|
|
|
addOrderLog(tl,reason);
|
|
|
- pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
+ pushGeneralSendNoticeAndEmail(aids, noticeType,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
|