|
|
@@ -846,7 +846,7 @@ public class TradeOrderPayServiceImpl implements TradeOrderPayService {
|
|
|
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)) {
|
|
|
//如果旅行社搬单,必须一次性支付
|
|
|
- Asserts.isTrue(tradeOrder.getPayAmount().compareTo(payOrderReqVO.getPayAmount()) == 0, "支付金额需等于订单支付金额");
|
|
|
+// Asserts.isTrue(tradeOrder.getPayAmount().compareTo(payOrderReqVO.getPayAmount()) == 0, "支付金额需等于订单支付金额");
|
|
|
//支付方式不能为现金,支付金额不能为0
|
|
|
Asserts.isTrue(ObjectUtil.notEqual(payOrderReqVO.getPayType(), PayTypeEnum.CASH.getType()), "支付方式不能为现金");
|
|
|
}
|