|
|
@@ -142,7 +142,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认意向订单"));
|
|
|
}
|
|
|
if(confirm){
|
|
|
- tOrder.setOrderStatus(OrderState.WAIT_FOR_PAY.getCode());
|
|
|
+ tOrder.setOrderStatus(OrderState.WAIT_FOR_FIRST_PAY.getCode());
|
|
|
tOrder.setIntentionStatus(IntentionSate.SELLER_CONFIRM.getCode());
|
|
|
tOrder.setTradingStatus(TradingState.ON_TRADE.getCode());
|
|
|
}else{
|
|
|
@@ -151,7 +151,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setTradingStatus(TradingState.TRADE_FAILED.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_FIRST){ // 支付首付(审核员先审核流水)
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_FIRST_PAY.getCode()
|
|
|
|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
|
|
|
|| tOrder.getPaymentStatus() != PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
@@ -179,7 +179,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setLiquidationStatus(LiquidationSate.PART_PAY.getCode());
|
|
|
}
|
|
|
}else if(orderAction == OrderAction.CONFIRM_PAY_FOR_LAST){ //支付尾款 (审核员先审核流水)
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_LAST_PAY.getCode()
|
|
|
|| tOrder.getIntentionStatus() != IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
|| tOrder.getTradingStatus() != TradingState.ON_TRADE.getCode()
|
|
|
|| tOrder.getPaymentStatus() != PaymentState.ALREADY_FIRST_PAY.getCode()
|
|
|
@@ -326,7 +326,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setConfirmIntention(false);
|
|
|
active.setRefuseIntention(false);
|
|
|
}
|
|
|
- if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_FIRST_PAY.getCode()
|
|
|
&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
|
|
|
&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
@@ -335,7 +335,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
} else {
|
|
|
active.setPayForFirst(false);
|
|
|
}
|
|
|
- if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_LAST_PAY.getCode()
|
|
|
&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
|
|
|
&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()
|
|
|
@@ -434,7 +434,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setApplyForWithdraw(false);
|
|
|
}
|
|
|
//平台作为中间方 确认首付 -尾款-提现-退款
|
|
|
- if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_FIRST_PAY.getCode()
|
|
|
&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
|
|
|
&& tOrder.getPaymentStatus() == PaymentState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
@@ -443,7 +443,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else{
|
|
|
active.setConfirmPayForFirst(false);
|
|
|
}
|
|
|
- if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_PAY.getCode()
|
|
|
+ if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_LAST_PAY.getCode()
|
|
|
&& tOrder.getIntentionStatus() == IntentionSate.SELLER_CONFIRM.getCode()
|
|
|
&& tOrder.getTradingStatus() == TradingState.ON_TRADE.getCode()
|
|
|
&& tOrder.getPaymentStatus() == PaymentState.ALREADY_FIRST_PAY.getCode()
|