From b005bef1c47fdb48d4ab2f57fc9f327070c2fa03 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 11 May 2023 14:59:33 +0800 Subject: [PATCH] =?UTF-8?q?//=E5=95=86=E6=88=B7=E5=BB=BA=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponController.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 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 f1b1abb1d..13da18250 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -179,9 +179,7 @@ public class WxCouponController extends BaseController { if(null == wxCoupon.getContentType()){ wxCoupon.setContentType(EnumCouponContentType.NORMAL.getCode()); } - if(null == wxCoupon.getSourceType()){ - wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); - } + wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); ResultData resultData = wxCouponService.saveOrUpdate(wxCoupon); if (resultData.code != 200) { @@ -571,6 +569,7 @@ public class WxCouponController extends BaseController { // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); @@ -619,6 +618,7 @@ public class WxCouponController extends BaseController { // wxCoupon.setEnddate(DateUtils.stringToDate(DateUtils.getSystemTime("yyyy-MM-dd") + " 23:59:59")); // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); @@ -655,6 +655,7 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel(); @@ -697,6 +698,7 @@ public class WxCouponController extends BaseController { // } wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + if (null != wxCoupon.getStartdate() || null != wxCoupon.getEnddate()) { //根据上架时间查询券 WxCouponChannel couponChannelQ = new WxCouponChannel();