From 4911a8e2ae603dbffd38ae3231317ff12beec3fb Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 11 May 2023 16:54:29 +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 --- .../controller/market/WxCouponChannelController.java | 5 ++++- .../com/iformall/controller/market/WxCouponController.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 19707d183..c72bf14ab 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -72,8 +72,11 @@ public class WxCouponChannelController extends BaseController { } wxCouponChannel.updateTenantInfo(getTenantInfo()); - if(null == wxCouponChannel.getSourceType()){ + //默认A端建券 + if(wxCouponChannel.getSourceType() == null){ wxCouponChannel.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + }else if(wxCouponChannel.getSourceType() == -1){ + wxCouponChannel.setSourceType(null); } if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){ 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 ab0c9c636..cc5ea132e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -106,9 +106,12 @@ public class WxCouponController extends BaseController { private ResultData couponList(WxCoupon wxCoupon, Integer pageNum, Integer pageSize,Boolean isList) { //默认A端建券 - if(null == wxCoupon.getSourceType()){ + if(wxCoupon.getSourceType() == null){ wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Admin.getCode()); + }else if(wxCoupon.getSourceType() == -1){ + wxCoupon.setSourceType(null); } + //排序处理 if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ String coryColumn = "c."+wxCoupon.getSortColumns();