From 71bfa96d9d20a939d4a8a49cc97b20ca2a44237a Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 29 Sep 2018 17:19:05 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=B2=BE=E5=87=86=E5=8F=91=E5=88=B8=E5=9B=9E=E6=98=BE=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/CouponInjectController.java | 7 +++++++ .../java/com/iformall/domain/po/CouponInject.java | 11 +++++++++++ 2 files changed, 18 insertions(+) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java index a356f55a5..a4e14d74d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java @@ -5,9 +5,12 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.CouponInject; +import com.iformall.domain.po.WxMsg; +import com.iformall.domain.po.WxMsgModel; import com.iformall.enums.EnumCouponInjectSendType; import com.iformall.service.CouponInjectService; import com.iformall.service.WxCUserTagsService; +import com.iformall.service.WxMsgModelService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -31,6 +34,8 @@ public class CouponInjectController extends BaseController { private CouponInjectService couponInjectService; @Autowired private WxCUserTagsService wxCUserTagsService; + @Autowired + private WxMsgModelService wxMsgModelService; @ApiOperation("分页列表接口") @GetMapping("list") @@ -90,6 +95,8 @@ public class CouponInjectController extends BaseController { if (!tagids.isEmpty()) { couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); } + + couponInject.setMsgModel(wxMsgModelService.getById(couponInject.getModelId())); } return new ResultData(Result.SUCCESS, "查询成功", couponInject); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java b/mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java index 8efa26f09..93aa71349 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java @@ -23,6 +23,17 @@ public class CouponInject implements Serializable { @Transient protected WxChooseTagVo wxChooseTagVo; + public WxMsgModel getMsgModel() { + return msgModel; + } + + public void setMsgModel(WxMsgModel msgModel) { + this.msgModel = msgModel; + } + + @Transient + protected WxMsgModel msgModel; + @Transient protected Date sendTimeStart;