From 12fd10ab5d709426c745cb0a70ba04b59cdbe717 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 20 Mar 2023 18:20:06 +0800 Subject: [PATCH] fix business --- .../main/java/com/iformall/mapper/WxBusinessMapper.java | 4 ++-- .../com/iformall/service/impl/WxBusinessServiceImpl.java | 4 ++-- .../src/main/resources/mapper/WxBusinessMapper.xml | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index dc567363a..252a22553 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(WxBusiness wxBusiness); - List findListForMerchant(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); - List findListForCoupon(@Param("wxBusiness")WxBusiness wxBusiness,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId, @Param("platCode") Integer platCode); + List findListForMerchant(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@Param("tenantId") String tenantId, @Param("parentTenantId") String parentTenantId); + List findListForCoupon(@Param("finalTenantId")String finalTenantId,@Param("isRoot")Integer isRoot,@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 a4a9cb7fb..789924c18 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -60,9 +60,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(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); + return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { - return wxBusinessMapper.findListForMerchant(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); + return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),EnumYesOrNo.YES.getCode(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); }else { return wxBusinessMapper.findListAll(bq); } diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index 7af68d48b..1d075cbc0 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -102,8 +102,8 @@ select from wx_business b - where b.`final_tenant_id` = #{wxBusiness.finalTenantId} - + where b.`final_tenant_id` = #{finalTenantId} + and b.`parent_id` is null and @@ -124,8 +124,8 @@ select from wx_business b - where b.`final_tenant_id` = #{wxBusiness.finalTenantId} - + where b.`final_tenant_id` = #{finalTenantId} + and b.`parent_id` is null and