|
|
@@ -248,6 +248,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
contractNoReplace(t.getOrderNo(), t2.getContractNo(),t2.getOrderDep());
|
|
|
createContractNo(t);
|
|
|
}
|
|
|
+ List<String> aids = new ArrayList<>();
|
|
|
+ Integer type=null;
|
|
|
+ AdminListBo a = adminMapper.getDeptNameByAid(TokenManager.getAdminId());
|
|
|
+ aids.addAll(adminMapper.listNameByDepAndName(a.getDepartmentId(), "营销管理员"));
|
|
|
+ type=NoticeStatus.ORDER_START.getCode();
|
|
|
+ generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
}
|
|
|
if (t2.getApproval()==ApprovalNewState.BH.getCode()||
|
|
|
t2.getOrderStatus()==OrderNewState.QDSHJJ.getCode()||
|
|
|
@@ -444,35 +450,53 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
TOrderNew t= new TOrderNew();
|
|
|
TOrderNew t2= checkDeleteSign(orderNo);
|
|
|
t.setOrderNo(orderNo);
|
|
|
+ List<String> aids = new ArrayList<>();
|
|
|
+ Integer type=null;
|
|
|
if (orderStatus==OrderNewState.QDSHTG.getCode()) {
|
|
|
- if (t2.getApproval()==ApprovalNewState.FTP.getCode()||t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
|
|
|
+ if (t2.getApproval()==ApprovalNewState.FTP.getCode()||
|
|
|
+ t2.getApproval()==ApprovalNewState.TG.getCode()) {//如果通过分配给财务管理员
|
|
|
t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
+ if(outsource==0) {
|
|
|
+ aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
|
|
|
+ } else if(outsource==1) {
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleList("外包审核员")) {
|
|
|
+ aids.add(admin.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ aids.add(organizationManagementMapper.selectByPrimaryKey(t2.getOrderDep()).getFinanceId());
|
|
|
}else {
|
|
|
t.setProcessStatus(ProcessStatus.YPTPSH.getCode());
|
|
|
+ for (Admin admin : adminMapper.getAdminRoleList("总裁")) {
|
|
|
+ aids.add(admin.getId());
|
|
|
+ }
|
|
|
}
|
|
|
- if(outsource!=null&&outsource==1) {
|
|
|
+ type=NoticeStatus.ORDER_YES.getCode();
|
|
|
+ if(outsource!=null&&outsource==1) {//通过外包
|
|
|
t.setOutsource(outsource);
|
|
|
addOrderLog(orderNo, OrderLogProcess.FQWB.getCode());
|
|
|
}else {
|
|
|
addOrderLog(orderNo, OrderLogProcess.SH.getCode());
|
|
|
}
|
|
|
- }
|
|
|
- if (outsource==0) {//非外包
|
|
|
- if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
|
|
|
+
|
|
|
+ }else if (orderStatus==OrderNewState.QDSHJJ.getCode()) {//如果不通过新增驳回
|
|
|
+ if (outsource==0) {//非外包
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
addBackOrder(orderNo, reason);
|
|
|
addOrderLog(orderNo, OrderLogProcess.BH.getCode());
|
|
|
- }
|
|
|
|
|
|
- }else if (outsource==1) {//外包
|
|
|
- o.setRefundStatus(0);
|
|
|
- if(o.getId()==null) {
|
|
|
- o.setCreateTime(new Date());
|
|
|
- tOrderOutsourceMapper.insertSelective(o);
|
|
|
- }else {
|
|
|
- tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
- }
|
|
|
+ }else if (outsource==1) {//外包
|
|
|
+ o.setRefundStatus(0);
|
|
|
+ if(o.getId()==null) {
|
|
|
+ o.setCreateTime(new Date());
|
|
|
+ tOrderOutsourceMapper.insertSelective(o);
|
|
|
+ }else {
|
|
|
+ tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ aids.add(t2.getSalesmanId());
|
|
|
+ type=NoticeStatus.ORDER_NO.getCode();
|
|
|
}
|
|
|
+ generalSendNoticeAndEmail(aids, type,t2.getOrderNo(), TokenManager.getAdminId());
|
|
|
t.setOrderStatus(orderStatus);
|
|
|
return tOrderNewMapper.updateByPrimaryKeySelective(t);
|
|
|
}
|
|
|
@@ -488,11 +512,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
ob.setBackStatus(0);//待处理
|
|
|
ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
ob.setAccept(tOrder.getSalesmanId());
|
|
|
- try {
|
|
|
+ /*try {
|
|
|
addNoticAndSendEmail(orderNo, null, NoticeStatus.ORDER_BACK.getCode());
|
|
|
} catch (UnsupportedEncodingException | MessagingException e) {
|
|
|
LoggerUtils.error(getClass(), "发送邮件失败", e);
|
|
|
- }
|
|
|
+ }*/
|
|
|
tOrderBackMapper.insertSelective(ob);
|
|
|
}
|
|
|
|