From b536e9692d3bdaee9fd3c3de9f327fbca69ecee2 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 7 Mar 2019 13:32:23 +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=E6=8A=95=E6=94=BE=E6=B8=A0=E9=81=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxScreenAdController.java | 11 +---------- .../java/com/iformall/domain/po/WxScreenAd.java | 13 +++++++++++++ .../service/impl/WxScreenAdServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/WxScreenAdMapper.xml | 8 ++++++-- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java index 8d8d6c398..41278c28f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java @@ -49,16 +49,7 @@ public class WxScreenAdController extends BaseController { public Result list(@ModelAttribute WxScreenAd wxScreenAd, Integer pageNum, Integer pageSize) { wxScreenAd.setTenantId(getTenantId()); wxScreenAd.setStatus(EnumScreenAdStatus.VALID.getCode()); - PageInfo page = wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize); - page.getList().stream().forEach(s->{ - Object target = null; - if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) - target = wxCouponChannelService.findDetailVo(s.getTargetId()); - else if (s.getType().equals(EnumScreenAdType.CAMPAIGN.getCode())) - target = wxCampaignService.getById(s.getTargetId()); - s.setTarget(target); - }); - return new ResultData(page); + return new ResultData(wxScreenAdService.listAsPage(wxScreenAd,pageNum,pageSize)); } @ApiOperation("添加广告") 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 43afb7616..5156dc624 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxScreenAd.java @@ -48,6 +48,10 @@ public class WxScreenAd implements Serializable { @io.swagger.annotations.ApiModelProperty(value="广告类型",name="type") private Integer type; + /**广告子类型 (券渠道)**/ + @io.swagger.annotations.ApiModelProperty(value="广告子类型",name="subType") + private Integer subType; + /**广告状态**/ @io.swagger.annotations.ApiModelProperty(value="设备状态",name="status") private Integer status; @@ -91,6 +95,14 @@ public class WxScreenAd implements Serializable { this.type = type; } + public Integer getSubType() { + return subType; + } + + public void setSubType(Integer subType) { + this.subType = subType; + } + public Integer getStatus() { return status; } @@ -152,6 +164,7 @@ public class WxScreenAd implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") ,Type_ASC("`type` ASC"),Type_DESC("`type` DESC") + ,SubType_ASC("`sub_type` ASC"),SubType_DESC("`sub_type` DESC") ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,CreateDate_ASC("`create_date` ASC"),CreateDate_DESC("`create_date` DESC") ,UpdateDate_ASC("`update_date` ASC"),UpdateDate_DESC("`update_date` DESC") 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 6f57362bc..48f4336fa 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxScreenAdServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; 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.WxCouponChannelMapper; import com.iformall.mapper.WxScreenAdMapper; @@ -58,6 +59,19 @@ public class WxScreenAdServiceImpl implements WxScreenAdService { @Override public ResultData saveOrUpdate(WxScreenAd record) { if (record.getId() == null) { + if (record.getType() == null || record.getTargetId() == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); + } + if (record.getType().equals(EnumScreenAdType.COUPON.getCode())) { + + WxCouponCVo wxCouponCVo = wxCouponChannelMapper.findVoDetail(record.getTargetId()); + if (wxCouponCVo == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + record.setCoverImg(wxCouponCVo.getCoverImg()); + record.setSubType(wxCouponCVo.getTargetAd()); + + } + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); record.setCreateDate(new Date()); diff --git a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml index c2cd4a275..3b3a5249c 100644 --- a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml @@ -5,17 +5,17 @@ + - - `id`, `tenant_id`, `type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `qrcode` + `id`, `tenant_id`, `type`, `sub_type`, `status`, `create_date`, `update_date`, `cover_img`, `target_id`, `qrcode` @@ -33,6 +33,10 @@ and `type` = #{type} + + and `sub_type` = #{subType} + + and `status` = #{status}