|
|
@@ -255,7 +255,10 @@ public class FundManagerOrderServiceImpl extends BaseMybatisDao<TOrderNewMapper>
|
|
|
//这里的已收金额是以前收的所有金额加上本次收的金额
|
|
|
orderNew.setSettlementAmount(billNew.getTransactionAmount().add(o.getSettlementAmount()));
|
|
|
orderNew.setLiquidationStatus(lstaus);
|
|
|
- if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode() || lstaus == LiquidationNewState.ALREADY_PAY.getCode()) && o.getProcessStatus() == ProcessStatus.YPCWZY.getCode()){//流程状态是3,结算是付款的话
|
|
|
+ if((lstaus == LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
+ || lstaus == LiquidationNewState.ALREADY_PAY.getCode())
|
|
|
+ && o.getProcessStatus() < ProcessStatus.YPCWZY.getCode()){
|
|
|
+ //流程状态是3,结算是付款的话
|
|
|
orderNew.setProcessStatus(ProcessStatus.YPZXSGLY.getCode());//4
|
|
|
}
|
|
|
if(result > 0){
|