From 306ef0432035c3fcb604c21b27d80c685ef7dc81 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 21 Sep 2019 16:08:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=AF=86][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E5=8D=A1=E9=A2=91=E9=81=93=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=85=8D=E8=B4=B9=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/market/WxCouponChannelController.java | 4 ---- .../src/main/java/com/iformall/domain/po/WxCouponChannel.java | 4 ---- .../src/main/resources/mapper/WxCouponChannelMapper.xml | 3 --- 3 files changed, 11 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 0bcdd11dd..f68ff413e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -61,10 +61,6 @@ public class WxCouponChannelController extends BaseController { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { wxCouponChannel.setStatus(null); } - if (wxCouponChannel.getTargetAd() != null && wxCouponChannel.getTargetAd().equals(EnumCouponChannelType.COUPON_CHANNEL_ID_CARD.getCode())) { - // 卡频道过滤掉免费卡 - wxCouponChannel.setSendType(EnumCouponSendType.ACTIVE.getCode()); - } wxCouponChannel.setTenantId(getTenantId()); wxCouponChannel.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); final PageInfo page = wxCouponChannelService.listPageCVo(wxCouponChannel, pageNum, pageSize); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java index ef3fda066..ecb7e890f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponChannel.java @@ -73,10 +73,6 @@ public class WxCouponChannel extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="积分售价(适用于类型10,11)",name="creditPrice") private Integer creditPrice; - @Transient - @io.swagger.annotations.ApiModelProperty(value="1.主动领取2.定向投放,用于卡购物频道",name="sendType") - private Integer sendType; - @Transient @SortColumn(column = "sale_price") private String salePriceStr; diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 9d9b6224d..282ec1180 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -25,9 +25,6 @@ where 1=1 - - and c.send_type = #{sendType} - and c.status = #{couponStatus}