From 263ea368c588bca0d132c7af3b87b610fcfd773f Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Tue, 22 Nov 2022 10:15:33 +0800 Subject: [PATCH] fix bug --- .../controller/market/WxCouponController.java | 4 +-- .../com/iformall/domain/po/WxCouponMall.java | 4 +++ .../iformall/domain/po/base/TenantEntity.java | 16 ++++++++++ .../iformall/service/WxCouponMallService.java | 2 +- .../service/impl/WxCouponMallServiceImpl.java | 30 +++++++++++++++++-- .../main/resources/mapper/WxMallMapper.xml | 7 +++++ 6 files changed, 58 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index eae80b8a8..6ad68d4c7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -568,7 +568,7 @@ public class WxCouponController extends BaseController { WxCouponMall wxCouponMall = new WxCouponMall(); wxCouponMall.updateTenantInfo(getTenantInfo()); wxCouponMall.setProductId(id); - return new ResultData(wxCouponMallService.list(wxCouponMall)); + return new ResultData(wxCouponMallService.list(wxCouponMall,true)); } @ApiOperation("商场查询:平台券商场列表") @@ -589,7 +589,7 @@ public class WxCouponController extends BaseController { //一个商场,每个平台券只有一条记录 wxCouponMall.setMallTenantId(tenantEntity.getTenantId()); wxCouponMall.setProductIds(Arrays.asList(ids)); - List mallList= wxCouponMallService.list(wxCouponMall); + List mallList= wxCouponMallService.list(wxCouponMall,false); if (null == mallList || mallList.size() <= 0 ) { return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java index 22e8c9c18..dc8f22de7 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponMall.java @@ -30,4 +30,8 @@ public class WxCouponMall extends TenantEntity { private Date updateDate; @io.swagger.annotations.ApiModelProperty(value="状态",name="status") private Integer status; + + @io.swagger.annotations.ApiModelProperty(value="商场信息",name="mall") + @TableField(exist = false) + protected WxMall mall; } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 1a0193db2..c69560c9a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; + +import java.util.List; + import org.apache.commons.lang3.StringUtils; /** @@ -27,6 +30,10 @@ public class TenantEntity extends BaseEntity { @JsonIgnore @TableField(exist = false) protected String shardTableSuffix; + + @io.swagger.annotations.ApiModelProperty(value="租户编号列表,查询使用",name="tenantIdList") + @TableField(exist = false) + protected List tenantIdList; public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); @@ -82,4 +89,13 @@ public class TenantEntity extends BaseEntity { public void setFinalTenantId(String finalTenantId) { this.finalTenantId = finalTenantId; } + + public List getTenantIdList() { + return tenantIdList; + } + + public void setTenantIdList(List tenantIdList) { + this.tenantIdList = tenantIdList; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java index 1e8480755..29eeda8af 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponMallService.java @@ -22,7 +22,7 @@ public interface WxCouponMallService { PageInfo listAsPage(WxCouponMall record, Integer pageIndex, Integer pageSize); - List list(WxCouponMall wxCouponMall); + List list(WxCouponMall wxCouponMall,boolean queryMall); void finised(String tenantId,Long couponId,String mallTenantId); void unfinised(String tenantId, Long couponId,Integer couponType, String mallTenantId) throws Exception; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java index 40d64553f..c7ecfc6ed 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponMallServiceImpl.java @@ -29,10 +29,36 @@ public class WxCouponMallServiceImpl implements WxCouponMallService { TtCouponChannelPoiMapper ttCouponChannelPoiMapper; @Autowired WxCouponChannelMapper wxCouponChannelMapper; + @Autowired + WxMallMapper wxMallMapper; @Override - public List list(WxCouponMall wxCouponMall){ - return wxCouponMallMapper.findList(wxCouponMall); + public List list(WxCouponMall wxCouponMall,boolean queryMall){ + List list = wxCouponMallMapper.findList(wxCouponMall); + if (queryMall) { + if (null != list && list.size() > 0 ) { + List mallTenantList = new ArrayList();; + for (int i = 0 ;i mallList = wxMallMapper.findList(mallq); + if (null != mallList && mallList.size() > 0) { + Map mallMap = new HashMap(); + for (WxMall m:mallList) { + mallMap.put(m.getTenantId(), m); + } + for (WxCouponMall cm : list) { + cm.setMall(mallMap.get(cm.getMallTenantId())); + } + } + } + } + return list; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 60eaab8e0..6073cefb3 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -145,6 +145,13 @@ and `group_support` = #{groupSupport} + + and tenant_id in + + #{tIdItem} + + + and id in