From f0f95f43ee0756d778309254546e1a5286d1b81d Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 16 May 2024 11:09:22 +0800 Subject: [PATCH] fix --- .../iformall/domain/po/WxLevelConfigCoupon.java | 3 +++ .../service/impl/WxLevelConfigServiceImpl.java | 17 ++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfigCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfigCoupon.java index 9cc87535c..3068bcaf4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfigCoupon.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLevelConfigCoupon.java @@ -21,6 +21,9 @@ public class WxLevelConfigCoupon extends BaseTenantEntity { private Long levelId; @io.swagger.annotations.ApiModelProperty(value="券编号",name="couponId") private Long couponId; + @io.swagger.annotations.ApiModelProperty(value="券编号",name="couponId") + @TableField(exist = false) + private String couponName; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index 64975f45b..3ee170e05 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -6,6 +6,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.IdWorker; import com.iformall.domain.dto.WxCUserBasicInfoDto; +import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxLevelConfig; import com.iformall.domain.po.WxLevelConfigCoupon; import com.iformall.domain.po.WxLevelMerchant; @@ -13,6 +14,7 @@ import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.vo.WxLevelMerchantCVo; import com.iformall.mapper.WxCUserBasicInfoMapper; +import com.iformall.mapper.WxCouponMapper; import com.iformall.mapper.WxLevelConfigCouponMapper; import com.iformall.mapper.WxLevelConfigMapper; import com.iformall.mapper.WxLevelMerchantMapper; @@ -44,6 +46,9 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { @Autowired WxLevelConfigCouponMapper wxLevelConfigCouponMapper; + + @Autowired + WxCouponMapper wxCouponMapper; @Autowired WxLevelMerchantMapper wxLevelMerchantapper; @@ -86,7 +91,17 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { WxLevelConfigCoupon cc = new WxLevelConfigCoupon(); cc.updateTenantInfo(l); cc.setLevelId(l.getId()); - l.setCoupons(wxLevelConfigCouponMapper.findList(cc)); + List coupons = wxLevelConfigCouponMapper.findList(cc); + if (null != coupons && coupons.size() > 0 ) { + for (int j = 0 ; j < coupons.size(); j++) { + WxLevelConfigCoupon wlcc = coupons.get(j); + WxCoupon c = wxCouponMapper.selectById(wlcc.getCouponId(),record.getTenantId()); + if (null != c) { + wlcc.setCouponName(c.getTitle()); + } + } + } + l.setCoupons(coupons); } return page; }