diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java index b032da2bc..cc56a787e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxPressBatch.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import java.util.Date; +import java.util.List; @TableName(value = "wx_press_batch") @Data @@ -17,7 +18,8 @@ public class WxPressBatch extends TenantEntity { private static final long serialVersionUID = 6722507735075416305L; protected Long id; - + @TableField(exist = false) + private List ids; @io.swagger.annotations.ApiModelProperty(value="批次名称",name="name") private String name; @io.swagger.annotations.ApiModelProperty(value="EnumPressBatchStatus",name="status") @@ -37,6 +39,8 @@ public class WxPressBatch extends TenantEntity { @TableField(exist = false) private String couponIds; + @TableField(exist = false) + private String couponName; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java index cd3712207..f318f4a16 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxPressBatchItemMapper.java @@ -10,6 +10,8 @@ import org.apache.ibatis.annotations.Param; public interface WxPressBatchItemMapper extends CommonMapper { List findList(WxPressBatchItem record); + + List getBatchIdList(@Param("couponIds")List couponIds,@Param("tenantId")String tenantId,@Param("pressBatchStatus")Integer pressBatchStatus); WxPressBatchItem getById(@Param("id")Long id,@Param("tenantId")String tenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java index 0932c6e9e..267eb4072 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPressBatchServiceImpl.java @@ -1,5 +1,6 @@ package com.iformall.service.impl; +import com.aliyun.openservices.shade.org.apache.commons.lang3.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -34,6 +35,8 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { WxOrderPressMapper wxOrderPressMapper; @Autowired WxOrderMapper wxOrderMapper; + @Autowired + WxCouponMapper wxCouponMapper; @Override @@ -43,6 +46,23 @@ public class WxPressBatchServiceImpl implements WxPressBatchService { @Override public PageInfo listAsPage(WxPressBatch record, Integer pageIndex, Integer pageSize) { + if (!StringUtils.isBlank(record.getCouponName())) { + WxCoupon cq = new WxCoupon(); + cq.updateTenantInfo(record); + cq.setTitle(StringUtils.trimToNull(record.getCouponName())); + List cids = wxCouponMapper.findIdList(cq); + if (null == cids || cids.size() <= 0 ) { + record.setId(0L); + }else { + List ids = wxPressBatchItemMapper.getBatchIdList(cids, record.getTenantId(), record.getStatus()); + if (null == ids || ids.size() <= 0) { + record.setId(0L); + }else { + record.setIds(ids); + } + } + } + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxPressBatchMapper.findList(record)); } diff --git a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml index 05916ca73..29ff0ef35 100644 --- a/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPressBatchItemMapper.xml @@ -56,6 +56,19 @@ order by ${sortColumns} + +