|
|
@@ -85,12 +85,12 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
|
|
|
TOrderNew o2=new TOrderNew();
|
|
|
o2.setOrderNo(o.getOrderNo());
|
|
|
o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));
|
|
|
- if(o2.getSettlementAmount().compareTo(o2.getFirstAmount())== -1) {
|
|
|
+ if(o2.getSettlementAmount().compareTo(o.getFirstAmount())== -1) {
|
|
|
o2.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
|
|
|
- }else if(o2.getSettlementAmount().compareTo(o2.getFirstAmount())==0&&
|
|
|
- o2.getSettlementAmount().compareTo(o2.getTotalAmount())== -1) {
|
|
|
+ }else if(o2.getSettlementAmount().compareTo(o.getFirstAmount())> -1&&
|
|
|
+ o2.getSettlementAmount().compareTo(o.getTotalAmount())== -1) {
|
|
|
o2.setLiquidationStatus(LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
- }else if(o2.getSettlementAmount().compareTo(o2.getTotalAmount())== 0) {
|
|
|
+ }else if(o2.getSettlementAmount().compareTo(o.getTotalAmount())== 0) {
|
|
|
o2.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
|
|
|
}
|
|
|
tOrderNewMapper.updateByPrimaryKeySelective(o2);
|