From 868345a03322f365598e9d9b0a629a44fe612708 Mon Sep 17 00:00:00 2001 From: zhengfangyuan Date: Mon, 12 Dec 2022 17:46:03 +0800 Subject: [PATCH] fix bug --- .../com/iformall/domain/po/base/TenantEntity.java | 12 ++++++++++++ .../service/impl/WxCouponOrderServiceImpl.java | 14 ++++++++++++-- .../src/main/resources/mapper/WxMallMapper.xml | 7 +++++++ 3 files changed, 31 insertions(+), 2 deletions(-) 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 74ce9e6f9..b1172ea08 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 @@ -34,6 +34,10 @@ public class TenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户编号列表,查询使用",name="tenantIdList") @TableField(exist = false) protected List tenantIdList; + + @io.swagger.annotations.ApiModelProperty(value="父租户编号列表,查询使用",name="parentTenantIdList") + @TableField(exist = false) + protected List parentTenantIdList; public void updateTenantInfo(TenantEntity info) { tenantId = info.getTenantId(); @@ -98,4 +102,12 @@ public class TenantEntity extends BaseEntity { this.tenantIdList = tenantIdList; } + public List getParentTenantIdList() { + return parentTenantIdList; + } + + public void setParentTenantIdList(List parentTenantIdList) { + this.parentTenantIdList = parentTenantIdList; + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index ea7a63185..37b45c41a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -395,7 +395,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); //查询子广场 WxMall wxMallq = new WxMall(); - wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId()); + List partlist = new ArrayList(); + partlist.add(couponOrderTenantEntity.getTenantId()); + if (null != couponOrderTenantEntity.getParentTenantId()) { + partlist.add(couponOrderTenantEntity.getParentTenantId()); + } + wxMallq.setParentTenantIdList(partlist); List mallList = wxMallMapper.findList(wxMallq); if ( null != mallList && mallList.size() > 0 ) { for (WxMall mall : mallList) { @@ -923,7 +928,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { mallTenantIdList.add(couponOrderTenantEntity.getTenantId()); //查询子广场 WxMall wxMallq = new WxMall(); - wxMallq.setParentTenantId(couponOrderTenantEntity.getTenantId()); + List partlist = new ArrayList(); + partlist.add(couponOrderTenantEntity.getTenantId()); + if (null != couponOrderTenantEntity.getParentTenantId()) { + partlist.add(couponOrderTenantEntity.getParentTenantId()); + } + wxMallq.setParentTenantIdList(partlist); List mallList = wxMallMapper.findList(wxMallq); if ( null != mallList && mallList.size() > 0 ) { for (WxMall mall : mallList) { diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 6073cefb3..cce5879de 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -151,6 +151,13 @@ #{tIdItem} + + + and parent_tenant_id in + + #{ptIdItem} + + and id in