|
|
@@ -116,11 +116,28 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); |
|
|
logger.error("pay order, order not allow, repaymentReq: " + record.toString() + ", payWay: " + payWay.toString()); |
|
|
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); |
|
|
throw new MallinkException(ErrorCode.ORDER_IS_NOT_FIND); |
|
|
} |
|
|
} |
|
|
if (order.getOrderStatus() != EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode() && |
|
|
|
|
|
order.getOrderStatus() != EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()) { |
|
|
|
|
|
// 添加砍价券判断 |
|
|
|
|
|
logger.error("pay order, order status not allow, repaymentReq: " + order.toString() + " , payWay: " + payWay.toString()); |
|
|
|
|
|
throw new MallinkException(ErrorCode.ORDER_IS_NOT_PAY); |
|
|
|
|
|
|
|
|
if(order.getPressEndDate() == null) { |
|
|
|
|
|
// 非砍价券 |
|
|
|
|
|
if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()) { |
|
|
|
|
|
logger.error("订单已支付: " + order.toString() + " , payWay: " + payWay.toString()); |
|
|
|
|
|
throw new MallinkException(ErrorCode.ORDER_HAD_PAY); |
|
|
|
|
|
} else if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()) { |
|
|
|
|
|
logger.error("订单已取消: " + order.toString() + " , payWay: " + payWay.toString()); |
|
|
|
|
|
throw new MallinkException(ErrorCode.ORDER_HAD_CANCEL); |
|
|
|
|
|
} else { |
|
|
|
|
|
if(order.getOrderStatus() != EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()) { |
|
|
|
|
|
logger.error("订单已支付: " + order.toString() + " , payWay: " + payWay.toString()); |
|
|
|
|
|
throw new MallinkException(ErrorCode.ORDER_IS_NOT_PAY); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
} else if(order.getPressEndDate() != null) { |
|
|
|
|
|
// 砍价券,只有在过期时无法支付 |
|
|
|
|
|
// 砍价中,原价购买 |
|
|
|
|
|
// 砍价完成,低价购买 |
|
|
|
|
|
if (order.getOrderStatus() == EnumOrderStatus.ORDER_STATUS_PRESS_OVERTIME.getCode()) { |
|
|
|
|
|
logger.error("砍价已过期: " + order.toString() + " , payWay: " + payWay.toString()); |
|
|
|
|
|
throw new MallinkException(ErrorCode.ORDER_PRESS_IS_OVERTIME); |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
if (order.getPaymentType() != EnumPayType.PAY_PAYMENT.getCode()) { |
|
|
if (order.getPaymentType() != EnumPayType.PAY_PAYMENT.getCode()) { |
|
|
return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); |
|
|
return new ResultData(ErrorCode.PAY_ORDER_IS_NOT_PAYMENT); |
|
|
|