diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java index 9c7a23e88..cc3535096 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCoupon.java @@ -223,6 +223,9 @@ public class WxCoupon extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") private String giftList; + @TableField(exist = false) + private List giftCouponList; + @TableField(exist = false) @SortColumn(column = "press_count") private Integer pressSendCount; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 05174f3d6..76d8efbdb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -234,6 +234,14 @@ public class WxCouponServiceImpl implements WxCouponService { .collect(Collectors.toList()); } wxCouponCVo.setMerchantVoList(merchantList); + if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCouponCVo.getType())){ + WxCoupon coupon = new WxCoupon(); + coupon.updateTenantInfo(wxCouponCVo); + List longs = JSON.parseArray(wxCouponCVo.getGiftList(), Long.class); + coupon.setIds(longs); + wxCouponCVo.setGiftCouponList(wxCouponMapper.findList(coupon)); + } + return wxCouponCVo; }