From 3929eebf91c71d4da23261b2ac3921e82fbe4936 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 18 Aug 2020 14:55:46 +0800 Subject: [PATCH 1/2] bug --- .../com/iformall/service/impl/WxMerchantServiceImpl.java | 6 +++++- .../src/main/resources/mapper/WxCreditHistoryMapper.xml | 8 -------- .../src/main/resources/mapper/WxScoreHistoryMapper.xml | 6 ------ 3 files changed, 5 insertions(+), 15 deletions(-) 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 745c65aff..86a20c186 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantServiceImpl.java @@ -220,7 +220,11 @@ public class WxMerchantServiceImpl implements WxMerchantService { } WxLevelConfig wxLevelConfig = new WxLevelConfig(); - wxLevelConfig.setTenantId(wxMerchant.getTenantId()); + if(StringUtils.isNotBlank(wxMerchant.getParentTenantId())){ + wxLevelConfig.setTenantId(wxMerchant.getParentTenantId()); + }else{ + wxLevelConfig.setTenantId(wxMerchant.getTenantId()); + } wxLevelConfig.setSortColumns(BaseEntity.SortField.Points_ASC); wxMerchant.setLevelConfigList(wxLevelConfigService.listByMerchantId(wxMerchant.getId(),wxLevelConfig)); diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 8fffd5b8b..a39d15054 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -179,14 +179,6 @@