diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java index 1c824750e..2633b5fda 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPressBatchController.java @@ -104,16 +104,30 @@ public class WxPressBatchController extends BaseController { if (null == id) { return new ResultData(Result.ERROR,"参数错误"); } - List couponIdList = wxPressBatchService.getItemCouponIdList(id, getTenantInfo().getTenantId()); - WxCoupon record = new WxCoupon(); - record.updateTenantInfo(getTenantInfo()); - if (null != couponIdList && couponIdList.size() > 0 ) { - record.setIds(couponIdList); - }else { - record.setId(0L); + TenantEntity tenantEntity = getTenantInfo(); + List items = wxPressBatchService.getItemList(id, tenantEntity.getTenantId()); + if (null != items && items.size() > 0 ) { + List couponIdList = wxPressBatchService.getItemCouponIdList(id, tenantEntity.getTenantId()); + WxCoupon record = new WxCoupon(); + record.updateTenantInfo(getTenantInfo()); + if (null != couponIdList && couponIdList.size() > 0 ) { + record.setIds(couponIdList); + }else { + record.setId(0L); + } + List list = wxCouponService.list(record); + Map couponMap = new HashMap(); + if (null != list && list.size() > 0 ) { + for (WxCoupon c : list) { + couponMap.put(c.getId(), c); + } + } + for (WxPressBatchItem pbi : items) { + WxCoupon coupon = couponMap.get(pbi.getCouponId()); + pbi.setCoupon(coupon); + } } - List list = wxCouponService.list(record); - return new ResultData(list); + return new ResultData(items); } @ApiOperation("删除接口") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java index 916fa890a..34bd8cb62 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatchItem.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; import lombok.Data; @@ -27,4 +28,7 @@ public class WxPressBatchItem extends TenantEntity { private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") private Date updateDate; + + @TableField(exist = false) + private WxCoupon coupon; }