From f91ea07370367a3e08d4efd4f223e3e7052e40d3 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Mon, 20 Mar 2023 16:26:41 +0800 Subject: [PATCH] fix business --- .../java/com/iformall/domain/po/WxBusiness.java | 3 +++ .../com/iformall/mapper/WxBusinessMapper.java | 6 +++--- .../service/impl/WxBusinessServiceImpl.java | 17 +++++++++++------ .../service/impl/WxMerchantServiceImpl.java | 4 +++- .../main/resources/mapper/WxBusinessMapper.xml | 17 ++++++++++++++--- 5 files changed, 34 insertions(+), 13 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java index a6d4271e4..7927696f5 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusiness.java @@ -46,4 +46,7 @@ public class WxBusiness extends TenantEntityWithoutFinalTenantId { @TableField(exist = false) private Integer limitEnd; + @TableField(exist = false) + private Integer isRoot; + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java index 67ba61d4b..dc567363a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBusinessMapper.java @@ -10,9 +10,9 @@ public interface WxBusinessMapper extends CommonMapper { List findList(WxBusiness wxBusiness); - List findListAll(@Param("finalTenantId") String finalTenantId); - 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 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> 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 46b92059f..a4a9cb7fb 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessServiceImpl.java @@ -52,16 +52,19 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override public List findListAll(TenantEntity tenantEntity, Integer filter,Integer paltCode) { - if (filter == null){ - return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); + bq.setIsRoot(EnumYesOrNo.YES.getCode()); + if (filter == null){ + return wxBusinessMapper.findListAll(bq); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_COUPON.getCode())) { if (paltCode == null) paltCode = EnumAppPlat.WX.getCode(); - return wxBusinessMapper.findListForCoupon(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); + return wxBusinessMapper.findListForCoupon(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId(), paltCode); }else if (filter.equals(EnumBusinessFilter.FILTER_BY_MERCHANT.getCode())) { - return wxBusinessMapper.findListForMerchant(tenantEntity.getFinalTenantId(),tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); + return wxBusinessMapper.findListForMerchant(bq,tenantEntity.getTenantId(), tenantEntity.getParentTenantId()); }else { - return wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); + return wxBusinessMapper.findListAll(bq); } } @@ -210,7 +213,9 @@ public class WxBusinessServiceImpl implements WxBusinessService { @Override public Map findAllMap(TenantEntity tenantEntity) { - List list = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); + List list = wxBusinessMapper.findListAll(bq); Map map = new HashMap(); if (null != list) { for (int i = 0 ; i < list.size() ; i++) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java index 2f86051d0..3cdef0c75 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -215,7 +215,9 @@ public class WxMerchantServiceImpl implements WxMerchantService { if (null == merchantList || merchantList.size() <= 0 ) { return null; } - List bussinessList = wxBusinessMapper.findListAll(tenantEntity.getFinalTenantId()); + WxBusiness bq = new WxBusiness(); + bq.setFinalTenantId(tenantEntity.getFinalTenantId()); + List bussinessList = wxBusinessMapper.findListAll(bq); Map bussinessMap = new HashMap(); if (null != bussinessList) { for (int i = 0 ; i < bussinessList.size() ; i ++) { diff --git a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml index e6896876b..7af68d48b 100644 --- a/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBusinessMapper.xml @@ -88,10 +88,13 @@ - select from wx_business where `final_tenant_id` = #{finalTenantId} + + and `parent_id` is null + order by create_date asc @@ -99,7 +102,11 @@ select from wx_business b - where b.`final_tenant_id` = #{finalTenantId} and + where b.`final_tenant_id` = #{wxBusiness.finalTenantId} + + and b.`parent_id` is null + + and (select count(*) from wx_merchant m where b.id = m.business_id @@ -117,7 +124,11 @@ select from wx_business b - where b.`final_tenant_id` = #{finalTenantId} and + where b.`final_tenant_id` = #{wxBusiness.finalTenantId} + + and b.`parent_id` is null + + and (select count(*) from wx_coupon_channel cc where b.id = cc.business and cc.status = 0