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 d9bc3a260..fb90e20f5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -87,6 +87,11 @@ public class WxCouponController extends BaseController { EnumCouponType.COUPON_MULTIMCH.getCode()}; wxCoupon.setTypes(Arrays.asList(typeArray)); + + Integer[] sendTypeArray = { + EnumCouponSendType.ACTIVE.getCode(), + EnumCouponSendType.PASSIVE.getCode(),}; + wxCoupon.setSendTypes(Arrays.asList(sendTypeArray)); } return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表 } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index a0d42f058..598bc0735 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -67,9 +67,12 @@ public class WxCouponController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; + try { - couponChannelIdL = Long.valueOf(couponChannelId); - if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + couponChannelIdL = Long.valueOf(couponChannelId); + } + if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { @@ -144,9 +147,12 @@ public class WxCouponController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId/couponId为空"); } Long couponChannelIdL = 0L, couponIdL = 0L; + try { - couponChannelIdL = Long.valueOf(couponChannelId); - if (StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { + if (StringUtils.isNotBlank(couponChannelId) && !couponChannelId.equalsIgnoreCase(Constant.UNDEFINED)) { + couponChannelIdL = Long.valueOf(couponChannelId); + } + if (!StringUtils.isNotBlank(couponId) && !couponId.equalsIgnoreCase(Constant.UNDEFINED)) { couponIdL = Long.valueOf(couponId); } } catch (NumberFormatException e) { @@ -201,7 +207,7 @@ public class WxCouponController extends BaseController { } private WxCouponCVo generateWxCouponCVoForHtml(Long couponChannelIdL, Long couponIdL,String tenantId) { - if(couponChannelIdL != null){ + if(couponChannelIdL > 0l){ WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); if(cc == null){ return null; @@ -215,7 +221,7 @@ public class WxCouponController extends BaseController { couponCVo.setCouponId(cc.getCouponId()); couponCVo.setHtml(c.getHtml()); return couponCVo; - }else if(couponIdL != null){ + }else if(couponIdL > 0l){ WxCoupon c = couponService.getHtmlById(couponIdL,tenantId); if (c == null) { return null; @@ -231,7 +237,7 @@ public class WxCouponController extends BaseController { private WxCouponCVo generateWxCouponCVoex(Long couponChannelIdL,Long couponIdL,String tenantId) throws IllegalAccessException, InvocationTargetException { - if(couponChannelIdL != null){ + if(couponChannelIdL > 0l){ WxCouponChannel cc = wxCouponChannelService.getById(couponChannelIdL,tenantId); if(cc == null){ return null; @@ -247,7 +253,7 @@ public class WxCouponController extends BaseController { wxcv.setEndTime(cc.getEndTime()); wxcv.setQrCode(cc.getQrCode()); return wxcv; - }else if(couponIdL != null){ + }else if(couponIdL > 0l){ WxCouponCVo wxcv = couponService.getVoById(couponIdL,tenantId); return wxcv; } 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 cc3535096..1a0c2d0fb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -29,6 +29,9 @@ public class WxCoupon extends TenantEntity { @TableField(exist = false) protected List types; + @TableField(exist = false) + protected List sendTypes; + @TableField(exist = false) protected List notinTypes; diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index ecddd81a0..dc170bb31 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -392,10 +392,6 @@ and c.`use_limit_quantity` = #{useLimitQuantity} - - and c.`send_type` != 3 - - and c.`send_type` = #{sendType} @@ -577,6 +573,13 @@ + + and c.send_types in + + #{typesItem} + + + order by ${sortColumns}