| @@ -223,6 +223,9 @@ public class WxCoupon extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") | @io.swagger.annotations.ApiModelProperty(value="卷包内容",name="giftList") | ||||
| private String giftList; | private String giftList; | ||||
| @TableField(exist = false) | |||||
| private List<WxCoupon> giftCouponList; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| @SortColumn(column = "press_count") | @SortColumn(column = "press_count") | ||||
| private Integer pressSendCount; | private Integer pressSendCount; | ||||
| @@ -234,6 +234,14 @@ public class WxCouponServiceImpl implements WxCouponService { | |||||
| .collect(Collectors.toList()); | .collect(Collectors.toList()); | ||||
| } | } | ||||
| wxCouponCVo.setMerchantVoList(merchantList); | wxCouponCVo.setMerchantVoList(merchantList); | ||||
| if(EnumCouponType.COUPON_GIFT.getCode().equals(wxCouponCVo.getType())){ | |||||
| WxCoupon coupon = new WxCoupon(); | |||||
| coupon.updateTenantInfo(wxCouponCVo); | |||||
| List<Long> longs = JSON.parseArray(wxCouponCVo.getGiftList(), Long.class); | |||||
| coupon.setIds(longs); | |||||
| wxCouponCVo.setGiftCouponList(wxCouponMapper.findList(coupon)); | |||||
| } | |||||
| return wxCouponCVo; | return wxCouponCVo; | ||||
| } | } | ||||