diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java index d4a3480d6..b88b2b49a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardCVo.java @@ -59,6 +59,9 @@ public class WxCardCVo extends WxCouponOrder { @io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer") private Integer supportTransfer; + @io.swagger.annotations.ApiModelProperty(value = "couponChannelId", name = "couponChannelId") + private Long couponChannelId; + @Transient protected List statusS; @@ -172,6 +175,14 @@ public class WxCardCVo extends WxCouponOrder { this.supportTransfer = supportTransfer; } + public Long getCouponChannelId() { + return couponChannelId; + } + + public void setCouponChannelId(Long couponChannelId) { + this.couponChannelId = couponChannelId; + } + public static enum Field { Id_ASC("co.`id` ASC"), Id_DESC("co.`id` DESC"), TenantId_ASC("co.`tenant_id` ASC"), TenantId_DESC("co.`tenant_id` DESC"), diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index dbf69e6c6..041cc88e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -97,6 +97,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Autowired WxCardTransferInfoMapper wxCardTransferInfoMapper; + @Autowired + WxCouponChannelMapper wxCouponChannelMapper; + @Override public PageInfo listAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findList(record)); @@ -688,6 +691,13 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } WxCardCVo cardCVo = wxCouponOrderMapper.findCardDetailOfCUser(Long.valueOf(couponOrderId)); + Long couponId = cardCVo.getCouponId(); + WxCouponChannel wxCouponChannel = new WxCouponChannel(); + wxCouponChannel.setCouponId(couponId); + List list = wxCouponChannelMapper.findList(wxCouponChannel); + if (!list.isEmpty()) { + cardCVo.setCouponChannelId(list.get(0).getId()); + } if (cardCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(cardCVo);