Просмотр исходного кода

[卡券][修改]:精准发券回显模板信息

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
71bfa96d9d
2 измененных файлов: 18 добавлений и 0 удалений
  1. +7
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/CouponInjectController.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java

+ 7
- 0
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.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.CouponInject; 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.enums.EnumCouponInjectSendType;
import com.iformall.service.CouponInjectService; import com.iformall.service.CouponInjectService;
import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxCUserTagsService;
import com.iformall.service.WxMsgModelService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
@@ -31,6 +34,8 @@ public class CouponInjectController extends BaseController {
private CouponInjectService couponInjectService; private CouponInjectService couponInjectService;
@Autowired @Autowired
private WxCUserTagsService wxCUserTagsService; private WxCUserTagsService wxCUserTagsService;
@Autowired
private WxMsgModelService wxMsgModelService;


@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("list") @GetMapping("list")
@@ -90,6 +95,8 @@ public class CouponInjectController extends BaseController {
if (!tagids.isEmpty()) { if (!tagids.isEmpty()) {
couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids)); couponInject.setWxChooseTagVo(wxCUserTagsService.findChooseTag(getTenantId(), tagids));
} }

couponInject.setMsgModel(wxMsgModelService.getById(couponInject.getModelId()));
} }
return new ResultData(Result.SUCCESS, "查询成功", couponInject); return new ResultData(Result.SUCCESS, "查询成功", couponInject);
} }


+ 11
- 0
mallinkService/src/main/java/com/iformall/domain/po/CouponInject.java Просмотреть файл

@@ -23,6 +23,17 @@ public class CouponInject implements Serializable {
@Transient @Transient
protected WxChooseTagVo wxChooseTagVo; protected WxChooseTagVo wxChooseTagVo;


public WxMsgModel getMsgModel() {
return msgModel;
}

public void setMsgModel(WxMsgModel msgModel) {
this.msgModel = msgModel;
}

@Transient
protected WxMsgModel msgModel;

@Transient @Transient
protected Date sendTimeStart; protected Date sendTimeStart;




Загрузка…
Отмена
Сохранить