|
|
@@ -890,7 +890,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
flag2 = true;
|
|
|
}else if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()){
|
|
|
flag2 = true;
|
|
|
- if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) > 0){ //超过全付
|
|
|
+ if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signTotalAmount)) == 1){ //超过全付
|
|
|
tOrder.setLiquidationStatus(LiquidationState.AGREE_REFUND.getCode());
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
@@ -898,7 +898,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
- }else if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signFirstPayment)) < 0){ //未达首付
|
|
|
+ }else if(tOrder.getActuallyTotalAmount().compareTo(new BigDecimal(signFirstPayment)) == -1){ //未达首付
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
|
|
|
if(tOrder.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.NOT_SATISFY_CONDITION.getCode());
|
|
|
@@ -907,7 +907,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else{ //超过首付未全付
|
|
|
- tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode());
|
|
|
+ tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}
|