|
|
@@ -694,9 +694,11 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(ton);
|
|
|
TOrderNewBo tOrderNew = tOrderNewMapper.getSaleIdByOno(t.getOrderNo());
|
|
|
if (t.getType()!=OrderChangeType.JBGGT.getCode()){
|
|
|
+ //不是仅合同变更就看营销经理是否存在
|
|
|
if (tOrderNew.getManagerName()!=null){
|
|
|
noc.setProcessState(OrderChangeProcess.YXJL.getCode());
|
|
|
}else {
|
|
|
+ //营销经理不存在判定营销管理员
|
|
|
date.setTime(date.getTime()+500);
|
|
|
addOrderChangeLog("未设置营销经理自动通过", 2, t.getOrderNo(), noc.getId(),date);
|
|
|
List<Admin> admins = adminMapper.listAdminBydepIdAndRoleType(tOrderNew.getOrderDep(), AFTConstants.SALESMAN_ADMIN);
|
|
|
@@ -716,12 +718,13 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
//将所有审核重置
|
|
|
orderExamineMapper.updateByOrderNo(t.getOrderNo(),null,null);
|
|
|
pushZXS(t,date,1);
|
|
|
- }else if(t.getType()==OrderChangeType.ZS.getCode()){
|
|
|
+ }else if(t.getType()==OrderChangeType.ZS.getCode()||t.getType()==OrderChangeType.KJXY.getCode()){
|
|
|
noc.setProcessState(OrderChangeProcess.CWZY.getCode());
|
|
|
}else if(t.getType()==OrderChangeType.JJEBG.getCode()){
|
|
|
noc.setProcessState(OrderChangeProcess.JSZJ.getCode());
|
|
|
}
|
|
|
}else {
|
|
|
+ //不跳过就设置流程未营销管理员
|
|
|
noc.setProcessState(OrderChangeProcess.YXGLY.getCode());
|
|
|
}
|
|
|
|
|
|
@@ -732,7 +735,10 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
|
|
|
}
|
|
|
sendNotice(0, t);
|
|
|
pushOrderCangeProcess(noc);
|
|
|
- pushOrderExamine(noc.getOrderNo(),noc.getType());
|
|
|
+ //框架协议不需要设置咨询师审核角色
|
|
|
+ if (t.getType()!=OrderChangeType.KJXY.getCode()){
|
|
|
+ pushOrderExamine(noc.getOrderNo(),noc.getType());
|
|
|
+ }
|
|
|
}else if (changeType==2) {
|
|
|
noc.setCwCost(t.getCwCost());
|
|
|
noc.setRefundableAmount(t.getRefundableAmount());
|