From abef3729031ef3a3596b6ffdb242430b3e5c1d8c Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 8 Jan 2021 19:02:03 +0800 Subject: [PATCH 1/3] cuser --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 21f8644c9..f70172127 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -822,7 +822,7 @@ select - ,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${tenantInfo.shardFinalTableSuffix} credit - where credit.`tenant_id` = #{tenantInfo.finalTenantId} + ,(select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit + where credit.`tenant_id` = #{basicInfo.finalTenantId} and credit.credit_num > 0 and credit.c_user_id = cu.id and credit.create_date >= #{basicInfo.creditStartTime} @@ -831,8 +831,8 @@ and credit.create_date < #{basicInfo.creditEndTime} ) as addCredit, - (select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${tenantInfo.shardFinalTableSuffix} credit - where credit.`tenant_id` = #{tenantInfo.finalTenantId} + (select ifnull(sum(credit.credit_num),0) amount from wx_credit_history${basicInfo.shardFinalTableSuffix} credit + where credit.`tenant_id` = #{basicInfo.finalTenantId} and credit.credit_num < 0 and credit.c_user_id = cu.id and credit.create_date >= #{basicInfo.creditStartTime} From c14a89556ebd9e2c87a28a5b93eaf15314a54a44 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 8 Jan 2021 19:40:26 +0800 Subject: [PATCH 3/3] cuser --- .../main/java/com/iformall/domain/po/WxCUserBasicInfo.java | 4 ++-- .../iformall/service/impl/WxCUserBasicInfoServiceImpl.java | 1 + .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java index 3a48cf7c7..8ab9d34a8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCUserBasicInfo.java @@ -37,8 +37,8 @@ public class WxCUserBasicInfo extends TenantEntityWithoutFinalTenantId { protected String shardFinalTableSuffix; public String getShardFinalTableSuffix(){ - if(StringUtils.isNotBlank(getFinalTenantId())){ - shardFinalTableSuffix = "_" + Integer.parseInt(getFinalTenantId())%100; + if(StringUtils.isNotBlank(finalTenantId)){ + shardFinalTableSuffix = "_" + Integer.parseInt(finalTenantId)%100; } return shardFinalTableSuffix; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 219fcef87..12b8000c7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -1279,6 +1279,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc // }else{ // basicInfo.undateFinalTenantId(tenantInfo); // } + list = wxCUserBasicInfoMapper.findVoList1(tenantInfo,basicInfo); if (null == list || list.size() <= 0 ) { return null; diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 39c118cba..004346fe9 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -841,7 +841,7 @@ and credit.create_date < #{basicInfo.creditEndTime} ) as lesCredit from wx_c_user_basic_info cu - left join wx_c_user_tags cut on cut.`id` = cu.`tag_id` + left join wx_c_user_tags${basicInfo.shardFinalTableSuffix} cut on cut.`id` = cu.`tag_id` limit #{basicInfo.begin}, #{basicInfo.limit}