From 8700c02969e4cdfe340212fcbfdbb8cffab5d2ce Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 20 Mar 2023 12:34:47 +0800 Subject: [PATCH] fix business --- .../main/java/com/iformall/mapper/WxBusinessMapper.java | 4 ++-- .../com/iformall/service/impl/WxBusinessServiceImpl.java | 4 ++-- .../service/invest/impl/InvestBizServiceImpl.java | 2 +- .../src/main/resources/mapper/WxBusinessMapper.xml | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 8c8619dd9..67ba61d4b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -11,8 +11,8 @@ public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); List findListAll(@Param("finalTenantId") String finalTenantId); - List findListForMerchant(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); - List findListForCoupon(@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); + List findListForMerchant(@Param("finalTenantId") String finalTenantId,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); + List findListForCoupon(@Param("finalTenantId") String finalTenantId,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); List> businessDataList(WxBusiness wxBusiness); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java index c584293d6..46b92059f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -57,9 +57,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { if (paltCode == null) paltCode = EnumAppPlat.WX.getCode(); - return wxBusinessMapper.findListForCoupon(tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); + return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { - return wxBusinessMapper.findListForMerchant(tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); + return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); }else { return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index b76176ffa..37f74fc46 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -399,7 +399,7 @@ public class InvestBizServiceImpl implements InvestBizService { private Map getBusinessMap(TenantEntity tenantEntity) { WxBusiness bq = new WxBusiness(); bq.setFinalTenantId(tenantEntity.getFinalTenantId()); - List businesses = businessService.listAsPage(null, 1, Integer.MAX_VALUE).getList(); + List businesses = businessService.listAsPage(bq, 1, Integer.MAX_VALUE).getList(); return getMap(businesses, WxBusiness::getTitle); } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index f23aba428..e6896876b 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -98,8 +98,8 @@ select - from wx_business b - where + from wx_business b + where b.`final_tenant_id` = #{finalTenantId} and (select count(*) from wx_coupon_channel cc where b.id = cc.business and cc.status = 0