From 95e403025c80c07aead4834a4d8e893a7f6b4911 Mon Sep 17 00:00:00 2001 From: xmzhao71 Date: Fri, 15 Sep 2023 13:53:15 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E6=8A=95=E6=94=BE=E5=8A=B5=E5=88=97=E8=A1=A8=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/market/WxCouponController.java | 55 ++++++++++--------- .../java/com/iformall/domain/po/WxCoupon.java | 3 + .../com/iformall/enums/EnumCouponType.java | 21 +++++++ 3 files changed, 54 insertions(+), 25 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 25833d143..6e9623d56 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -34,10 +34,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; @RestController @RequestMapping("wxCoupon") @@ -75,6 +72,10 @@ public class WxCouponController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); wxCoupon.updateTenantInfo(getTenantInfo()); + // 处理场景投放发劵显示筛选 + if (wxCoupon.getSpecifyShowFlag() != null && Boolean.TRUE.equals(wxCoupon.getSpecifyShowFlag())) { + wxCoupon.setTypes(EnumCouponType.getWxSendCouponType()); + } return couponList(wxCoupon, pageNum, pageSize, isList); } @@ -142,27 +143,31 @@ public class WxCouponController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponController::list"); if (wxCoupon == null) wxCoupon = new WxCoupon(); wxCoupon.updateTenantInfo(getTenantInfo()); - Integer[] typeArray = { - EnumCouponType.COUPON_MANJIAN.getCode(), - EnumCouponType.COUPON_DAIJIN.getCode(), -// EnumCouponType.COUPON_TUANGOU.getCode(), - EnumCouponType.COUPON_LIPIN.getCode(), - EnumCouponType.COUPON_TINGCHE.getCode(), - EnumCouponType.COUPON_MULTIMCH.getCode(), - EnumCouponType.COUPON_DOUYIN.getCode(), - EnumCouponType.COUPON_PRESS.getCode(), - EnumCouponType.COUPON_PREORDER.getCode(), - EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), - EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()}; - - wxCoupon.setTypes(Arrays.asList(typeArray)); - - Integer[] sendTypeArray = { - EnumCouponSendType.ACTIVE.getCode(), - EnumCouponSendType.PASSIVE.getCode(),}; - - wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); - +// Integer[] typeArray = { +// EnumCouponType.COUPON_MANJIAN.getCode(), +// EnumCouponType.COUPON_DAIJIN.getCode(), +//// EnumCouponType.COUPON_TUANGOU.getCode(), +// EnumCouponType.COUPON_LIPIN.getCode(), +// EnumCouponType.COUPON_TINGCHE.getCode(), +// EnumCouponType.COUPON_MULTIMCH.getCode(), +// EnumCouponType.COUPON_DOUYIN.getCode(), +// EnumCouponType.COUPON_PRESS.getCode(), +// EnumCouponType.COUPON_PREORDER.getCode(), +// EnumCouponType.COUPON_DOUYIN_GO_HOME.getCode(), +// EnumCouponType.COUPON_DOUYIN_DAIJIN.getCode()}; +// +// wxCoupon.setTypes(Arrays.asList(typeArray)); +// +// Integer[] sendTypeArray = { +// EnumCouponSendType.ACTIVE.getCode(), +// EnumCouponSendType.PASSIVE.getCode(),}; +// +// wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); + + // 处理场景投放发劵显示筛选 + if (wxCoupon.getSpecifyShowFlag() != null && Boolean.TRUE.equals(wxCoupon.getSpecifyShowFlag())) { + wxCoupon.setTypes(EnumCouponType.getWxTriggerSendCouponType()); + } if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ String coryColumn = "c."+wxCoupon.getSortColumns(); wxCoupon.setSortColumns(coryColumn); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 5e9b6651a..9ccd37664 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -533,5 +533,8 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "商品版本 EnumCouponVersion", name = "version") private Integer version; + + @io.swagger.annotations.ApiModelProperty(value = "场景投放发劵显示筛选") + private Boolean specifyShowFlag; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java index f8987f61d..9918f8966 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java @@ -134,6 +134,27 @@ public enum EnumCouponType { return typeList; } + public static List getWxSendCouponType(){ + List typeList = new ArrayList<>(); + typeList.add(COUPON_MANJIAN.getCode()); + typeList.add(COUPON_DAIJIN.getCode()); + typeList.add(COUPON_LIPIN.getCode()); + typeList.add(COUPON_TINGCHE.getCode()); + typeList.add(COUPON_MULTIMCH.getCode()); + return typeList; + } + + public static List getWxTriggerSendCouponType(){ + List typeList = new ArrayList<>(); + typeList.add(COUPON_MANJIAN.getCode()); + typeList.add(COUPON_DAIJIN.getCode()); + typeList.add(COUPON_LIPIN.getCode()); + typeList.add(COUPON_MULTIMCH.getCode()); + typeList.add(COUPON_PRESS.getCode()); + typeList.add(COUPON_GROUP.getCode()); + return typeList; + } + public static EnumAppPlat getAppPlat(Integer couponType){ if(getWeiXinType().contains(couponType)){ return EnumAppPlat.WX;