From 58ee4c09c021c672e713989bd1803d14ac13e23c Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 7 Mar 2019 14:14:07 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B9=BF=E5=91=8A=E6=A0=87=E9=A2=98=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/domain/po/WxScreenAd.java | 12 ++++++++++++ .../service/impl/WxScreenAdServiceImpl.java | 13 +++++++++++++ .../src/main/resources/mapper/WxScreenAdMapper.xml | 7 ++++++- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java index 5156dc624..16f9a4ef0 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java @@ -44,6 +44,10 @@ public class WxScreenAd implements Serializable { @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") private String tenantId; + /**标题**/ + @io.swagger.annotations.ApiModelProperty(value="标题",name="title") + private String title; + /**广告类型**/ @io.swagger.annotations.ApiModelProperty(value="广告类型",name="type") private Integer type; @@ -87,6 +91,14 @@ public class WxScreenAd implements Serializable { this.tenantId = tenantId; } + public String getTitle() { + return title; + } + + public void setTitle(String title) { + this.title = title; + } + public Integer getType() { return type; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java index 48f4336fa..da2c7aa01 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -10,13 +10,16 @@ import com.iformall.common.IdWorker; import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; +import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxScreenAd; import com.iformall.domain.vo.WxCouponCVo; import com.iformall.enums.EnumScreenAdType; +import com.iformall.mapper.WxCampaignMapper; import com.iformall.mapper.WxCouponChannelMapper; import com.iformall.mapper.WxScreenAdMapper; import com.iformall.service.WxAppinfoService; +import com.iformall.service.WxCampaignService; import com.iformall.service.WxScreenAdService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,6 +49,9 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { @Autowired WxCouponChannelMapper wxCouponChannelMapper; + @Autowired + WxCampaignMapper wxCampaignMapper; + @Override public PageInfo listAsPage(WxScreenAd record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxScreenAdMapper.findList(record)); @@ -69,7 +75,14 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); record.setCoverImg(wxCouponCVo.getCoverImg()); record.setSubType(wxCouponCVo.getTargetAd()); + record.setTitle(wxCouponCVo.getTitle()); + } else if (record.getType().equals(EnumScreenAdType.COUPON.getCode())){ + WxCampaign wxCampaign = wxCampaignMapper.selectByPrimaryKey(record.getTargetId()); + if (wxCampaign == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + record.setCoverImg(wxCampaign.getCoverImg()); + record.setTitle(wxCampaign.getTitle()); } final IdWorker idWorker = IdWorker.get(); diff --git a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml index 3b3a5249c..70d7dd33d 100644 --- a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml @@ -4,6 +4,7 @@ + @@ -15,7 +16,7 @@ - `id`, `tenant_id`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `qrcode` + `id`, `tenant_id`, `title`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `qrcode` @@ -29,6 +30,10 @@ and `tenant_id` = #{tenantId} + + and `title` like concat('%', #{title},'%') + + and `type` = #{type}