|
|
@@ -122,7 +122,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
|
|
|
record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
}
|
|
|
- addOrderLog(orderNo, OrderLogProcess.CWPD.getCode());
|
|
|
+ addOrderLog(orderNo, OrderLogProcess.CWPD.getCode(),null);
|
|
|
r = tOrderNewMapper.updateByPrimaryKeySelective(record);
|
|
|
}else{
|
|
|
//返回错误标志 提示订单编号或者财务专员选择错误
|
|
|
@@ -137,10 +137,11 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
return t;
|
|
|
}
|
|
|
|
|
|
- public void addOrderLog(String orderNo, Integer code) {
|
|
|
+ public void addOrderLog(String orderNo, Integer code, String reason) {
|
|
|
TOrderLog tl=new TOrderLog();
|
|
|
tl.setOrderNo(orderNo);
|
|
|
tl.setProcess(code);
|
|
|
+ tl.setRemarks(reason);
|
|
|
tl.setAid(TokenManager.getAdminId());
|
|
|
tOrderLogMapper.insertSelective(tl);
|
|
|
|
|
|
@@ -203,7 +204,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
back.setBackStatus(0);
|
|
|
back.setInitiate(TokenManager.getAdminId());//发起人
|
|
|
back.setAccept(b.getSalesmanId()); //查看该订单的负责人
|
|
|
- addOrderLog(back.getOrderNo(), OrderLogProcess.BH.getCode());
|
|
|
+ addOrderLog(back.getOrderNo(), OrderLogProcess.BH.getCode(),back.getReason());
|
|
|
c = backMapper.insertSelective(back);
|
|
|
List<String> aids = new ArrayList<>();
|
|
|
aids.add(t.getSalesmanId());;
|
|
|
@@ -264,7 +265,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
}
|
|
|
|
|
|
}
|
|
|
- addOrderLog(billNew.getOrderNo(), OrderLogProcess.CWQK.getCode());
|
|
|
+ addOrderLog(billNew.getOrderNo(), OrderLogProcess.CWQK.getCode(),billNew.getRemarks());
|
|
|
}else if(bd.compareTo(o.getTotalAmount()) == -1){//如果订单流水小于总金额
|
|
|
if(bd.compareTo(o.getFirstAmount()) == 0 || bd.compareTo(o.getFirstAmount()) == 1){//首付完成
|
|
|
//查看首付奖是否存在
|
|
|
@@ -279,7 +280,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
bonus.setBonusSubject(BonusSubject.SF.getCode());//11
|
|
|
}
|
|
|
lstaus = 1;
|
|
|
- addOrderLog(billNew.getOrderNo(), OrderLogProcess.CWSF.getCode());
|
|
|
+ addOrderLog(billNew.getOrderNo(), OrderLogProcess.CWSF.getCode(),billNew.getRemarks());
|
|
|
}
|
|
|
}
|
|
|
//否则新增流水信息
|
|
|
@@ -436,7 +437,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
orderNew.setRefundAmount(o.getSettlementAmount().subtract(billNew.getTransactionAmount().abs()));
|
|
|
orderNew.setLiquidationStatus(lstaus);
|
|
|
if(lstaus == 4){//如果款项全部退完就更改订单状态,这里不一定待商榷
|
|
|
- addOrderLog(billNew.getOrderNo(), OrderLogProcess.WCTD.getCode());
|
|
|
+ addOrderLog(billNew.getOrderNo(), OrderLogProcess.WCTD.getCode(),billNew.getRemarks());
|
|
|
//orderNew.setProcessStatus(6);
|
|
|
}
|
|
|
if(result > 0){
|