|
|
@@ -213,8 +213,19 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,""));
|
|
|
}
|
|
|
int boundary = tOrder.getActuallyFirstPayment().add(changeAmount).compareTo(tOrder.getSignFirstPayment());
|
|
|
- if(boundary == 1){
|
|
|
- throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"支付首付款"));
|
|
|
+ int boundary2 = tOrder.getActuallyTotalAmount().add(changeAmount).compareTo(tOrder.getSignTotalAmount());
|
|
|
+ if(boundary2 == 1){
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.PAY_BEYOND_SIGN,"支付首付款"));
|
|
|
+ }else if(boundary2 == 0){ //全付清
|
|
|
+ tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
+ tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
+ tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
+ }else if(boundary == 1){ //超过首付未达尾款
|
|
|
+ tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
+ tOrder.setActuallyFirstPayment(tOrder.getSignFirstPayment());
|
|
|
+ tOrder.setLiquidationStatus(LiquidationState.WAIT_PAY_LAST_BALANCE.getCode());
|
|
|
+ tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}else if(boundary == -1){ //首付待付清
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
tOrder.setActuallyFirstPayment(tOrder.getActuallyFirstPayment().add(changeAmount));
|
|
|
@@ -235,7 +246,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
}else if(boundary == 0){
|
|
|
tOrder.setOrderStatus(OrderState.ALREADY_SIGN.getCode());
|
|
|
- tOrder.setActuallyTotalAmount(tOrder.getActuallyTotalAmount().add(changeAmount));
|
|
|
+ tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请
|