From de12a8fce1a701990a24d46585debf6958506ce5 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 19 May 2022 12:13:24 +0800 Subject: [PATCH] =?UTF-8?q?//=E6=9C=89=E6=95=88=E6=9C=9F30=E5=A4=A9?= =?UTF-8?q?=E3=80=81=E4=B8=AA=E4=BA=BA=E9=80=80=E6=AC=BE=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/market/WxCouponController.java | 4 +++- .../main/java/com/iformall/controller/WxOrderController.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index f91b8f230..61b790b8c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -298,7 +298,9 @@ public class WxCouponController extends BaseController { return new ResultData(ErrorCode.COUPON_STOCK_ENDTIME_ERR); } wxCoupon.setSalePrice(coupon.getSalePrice()); - if(!wxCouponService.validCouponDate(wxCoupon)) { + if(!EnumCouponType.COUPON_DOUYIN.getCode().equals(wxCoupon.getType()) + && !wxCouponService.validCouponDate(wxCoupon)) { +// if(!wxCouponService.validCouponDate(wxCoupon)) { return new ResultData(ResultData.ERROR,"券有效使用日期必须在30天以内。"); } wxCoupon.setSalePrice(null); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 6cdb18ed6..92c32c30b 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -637,7 +637,7 @@ public class WxOrderController extends BaseController { } try { - wxRefundOrderService.createRefundOrder(getTenantInfo(), orderId, EnumPayType.PAY_ADMIN_REFUND, null,null); + wxRefundOrderService.createRefundOrder(getTenantInfo(), orderId, EnumPayType.PAY_C_REFUND, null,null); return new ResultData(); } catch (MallinkException e) { logger.error(e.getMessage(),e);