|
|
@@ -515,7 +515,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
|
|
|
|
|
|
private void validate(TradeOrderDO tradeOrder,PayOrderReqVO payOrderReqVO){
|
|
|
|
|
|
- Asserts.isTrue(ObjectUtils.equalsAny(tradeOrder.getOrderStatus(),TradeOrderStatusEnum.UNPAID.getStatus()
|
|
|
+ Asserts.isTrue(ObjectUtils.equalsAny(tradeOrder.getOrderStatus(),TradeOrderStatusEnum.UNPAID.getStatus(),TradeOrderStatusEnum.YD.getStatus()
|
|
|
,TradeOrderStatusEnum.PAYING.getStatus()),"当前状态无法支付{}",tradeOrder.getOrderStatus());
|
|
|
if(ObjectUtil.equal(tradeOrder.getSellMethod(),SellMethodEnum.OTC_MOVE_ORDER.getType()) && ObjectUtil.notEqual(tradeOrder.getIsChangeOrder(),ORDER_CHANGE_TYPE_NEW)){
|
|
|
//如果旅行社搬单,必须一次性支付
|
