|
|
@@ -482,19 +482,20 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
addOrderLog(t2.getOrderNo(),OrderLogProcess.TJ.getCode(), null);
|
|
|
if(t2.getProcessStatus()<ProcessStatus.YPYXJL.getCode()) {
|
|
|
//添加营销管理员审核经理
|
|
|
+ Integer orderStatus=OrderNewState.QDDS.getCode();
|
|
|
if (a.getManagerId()!=null){
|
|
|
t.setProcessStatus(ProcessStatus.YPYXJL.getCode());
|
|
|
}else {
|
|
|
if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
addOrderLog(t2.getOrderNo(),OrderLogProcess.SH.getCode(), "管理员跳过自己审核");
|
|
|
t.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
- t.setOrderStatus(2);
|
|
|
+ orderStatus=OrderNewState.QDSHTG.getCode();
|
|
|
}else {
|
|
|
addOrderLog(t2.getOrderNo(),OrderLogProcess.YXJLTT.getCode(), "无经理跳过审核");
|
|
|
t.setProcessStatus(ProcessStatus.YPYXGLY.getCode());
|
|
|
}
|
|
|
}
|
|
|
- t.setOrderStatus(OrderNewState.QDDS.getCode());
|
|
|
+ t.setOrderStatus(orderStatus);
|
|
|
|
|
|
}
|
|
|
//特批逻辑处理
|