|
|
@@ -1089,6 +1089,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
ob.setBackStatus(0);//待处理
|
|
|
ob.setInitiate(TokenManager.getAdminId()==null?"1":TokenManager.getAdminId());
|
|
|
ob.setAccept(tOrder.getSalesmanId());
|
|
|
+ TOrderLog tl=new TOrderLog();
|
|
|
+ tl.setOrderNo(orderNo);
|
|
|
+ tl.setProcess(OrderLogProcess.BH.getCode());
|
|
|
+ addOrderLog(tl,reason);
|
|
|
tOrderBackMapper.insertSelective(ob);
|
|
|
}
|
|
|
|
|
|
@@ -1247,17 +1251,17 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
}
|
|
|
type=NoticeStatus.ORDER_APPROVA_YES.getCode();
|
|
|
tl.setProcess(OrderLogProcess.TP.getCode());
|
|
|
+ addOrderLog(tl,reason);
|
|
|
} else {
|
|
|
if (t2.getApproval()==ApprovalNewState.ZCDSH.getCode())t.setApproval(ApprovalNewState.ZCBH.getCode());
|
|
|
else if (t2.getApproval()==ApprovalNewState.DSZDSH.getCode())t.setApproval(ApprovalNewState.DSZBH.getCode());
|
|
|
t.setOrderStatus(OrderNewState.YBH.getCode());
|
|
|
t.setProcessStatus(ProcessStatus.YPYXY.getCode());
|
|
|
- addBackOrder(orderNo, reason);
|
|
|
tl.setProcess(OrderLogProcess.BH.getCode());
|
|
|
aids.add(t2.getSalesmanId());
|
|
|
type=NoticeStatus.ORDER_APPROVA_NO.getCode();
|
|
|
+ addBackOrder(orderNo, reason);
|
|
|
}
|
|
|
- addOrderLog(tl,reason);
|
|
|
TOrderNewBo order = tOrderNewMapper.getSaleIdByOno(orderNo);
|
|
|
pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t2.getApproval());
|
|
|
//新增特批催款信息
|