Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

new-dev
袁野 1 year ago
commit be3b31226e
  1. 2
      hai-order/src/main/java/com/web/controller/business/OrderCouponController.java

@ -240,7 +240,7 @@ public class OrderCouponController {
if (!order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) { if (!order.getProductType().equals(OrderProductType.PRODUCT_TYPE5.getNumber())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "只支持卡券交易补发"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "只支持卡券交易补发");
} }
if (order.getOrderStatus().equals(OrderStatusEnum.type2.getType())) { if (!order.getOrderStatus().equals(OrderStatusEnum.type2.getType())) {
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "补发失败!交易未处于已支付状态"); throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "补发失败!交易未处于已支付状态");
} }
if (!order.getExceptionStatus().equals(true)) { if (!order.getExceptionStatus().equals(true)) {

Loading…
Cancel
Save