|
|
@@ -113,7 +113,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
TOrderNew record = new TOrderNew();
|
|
|
record.setOrderNo(orderNo);
|
|
|
record.setFinanceId(financeId);
|
|
|
- record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
+ TOrderNew torder=tOrderNewMapper.selectByPrimaryKey(orderNo);
|
|
|
+ if(torder.getProcessStatus()<ProcessStatus.YPZXSGLY.getCode()) {
|
|
|
+ record.setProcessStatus(ProcessStatus.YPCWZY.getCode());
|
|
|
+ }
|
|
|
r = tOrderNewMapper.updateByPrimaryKeySelective(record);
|
|
|
}else{
|
|
|
//返回错误标志 提示订单编号或者财务专员选择错误
|
|
|
@@ -257,7 +260,7 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
orderNew.setLiquidationStatus(lstaus);
|
|
|
if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
|| lstaus == LiquidationNewState.ALREADY_PAY.getCode())
|
|
|
- && o.getProcessStatus() < ProcessStatus.YPCWZY.getCode()){
|
|
|
+ && o.getProcessStatus() < ProcessStatus.YPZXSGLY.getCode()){
|
|
|
//流程状态是3,结算是付款的话
|
|
|
orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
|
|
|
}
|