|
|
@@ -391,6 +391,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setConfirmIntention(false);
|
|
|
active.setRefuseIntention(false);
|
|
|
}
|
|
|
+ System.out.println("订单编号"+ tOrder.getOrderNo()+ "订单状态:" + tOrder.getOrderStatus() + "结算状态:" + tOrder.getLiquidationStatus());
|
|
|
if ((tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode() || tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
|
|
|
&&tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()) {
|
|
|
active.setPayForFirst(true); //支付首付
|
|
|
@@ -1266,14 +1267,20 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bill.setConfirmTime(confirmTime);
|
|
|
bill.setConfirmSign(AuditState.AUDIT_SUCCESS.getCode());
|
|
|
checkOrder(order);
|
|
|
- if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode())
|
|
|
- setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
|
|
|
+ if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) //代收+首付状态
|
|
|
+ setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
|
|
|
+ else if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) //代收+尾款状态
|
|
|
setOrderState(OrderAction.CONFIRM_PAY_FOR_LAST, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode())
|
|
|
+ else if(order.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.REFUND.getCode()) //待退+退款状态
|
|
|
setOrderState(OrderAction.COMPLETE_REFUND, bill.getTransactionAmount(), order, false);
|
|
|
- else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode())
|
|
|
- setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
|
|
|
+ else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
|
|
|
+ && bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) //待付+提现状态
|
|
|
+ setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
|
|
|
+ else
|
|
|
+ throw new BusinessException(new Error(ErrorConstants.BILL_ALREADY_EXPIRE, billNo , ""));
|
|
|
order.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
}else if(confrim == AFTConstants.NO){
|