From 2562b43d49a3fbb6b452def1a624c73662c5d1cb Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Jan 2022 23:19:45 +0800 Subject: [PATCH] =?UTF-8?q?/=E3=80=82ing?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/WxCreditHistoryMapper.java | 8 +- .../impl/WxCreditHistoryServiceImpl.java | 16 +++- .../mapper/WxCreditHistoryMapper.xml | 96 +++++++++---------- 3 files changed, 70 insertions(+), 50 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java index 084fe9afe..94522dae2 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCreditHistoryMapper.java @@ -38,7 +38,13 @@ public interface WxCreditHistoryMapper extends CommonMapper merchantCreditRanking(WxCreditHistory record); + List merchantCreditAdd(WxCreditHistory record); + + List merchantCreditLes(WxCreditHistory record); + + List merchantCreditAddUserCount(WxCreditHistory record); + + List merchantCreditLesUserCount(WxCreditHistory record); int monthCount(WxCreditHistory record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java index 3b1b9c775..f0b787c25 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCreditHistoryServiceImpl.java @@ -377,7 +377,21 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { @Override public PageInfo listAsPageMcrv(WxCreditHistory record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.merchantCreditRanking(record)); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(record.getTenantId()); + tenantEntity.setParentTenantId(record.getParentTenantId()); + + record.setTenantId(record.getFinalTenantId()); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.merchantCreditAdd(record)); + if(pageInfo.getList() != null && pageInfo.getList().size() > 0){ + List merchantIds = pageInfo.getList().stream().map(mcr -> mcr.getMerchantId()).collect(Collectors.toList()); + Map merchantNameMap = getMerchantNameMap(tenantEntity, merchantIds); + + + + } + + return pageInfo; } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml index 37f1318c9..9454a8d2c 100644 --- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml @@ -215,28 +215,12 @@ {call user_credit_clear(#{cutOffDate},#{finalTableIndex})} - - + select credit.merchant_id merchantId,sum(credit.credit_num) sumAddCredit + from wx_credit_history credit + where credit.merchant_id is not null and credit.merchant_id != -1 + and credit.credit_num > 0 + and `tenant_id` = #{tenantId} and credit.create_date >= #{startTime} @@ -244,13 +228,20 @@ and credit.create_date < #{endTime} GROUP BY credit.merchant_id - ) a on a.merchant_id = wm.id - left join - ( - select credit.merchant_id,sum(credit.credit_num) sum_credit_num - from wx_credit_history${shardFinalTableSuffix} credit - where credit.merchant_id is not null - and credit.merchant_id != -1 and credit.credit_num < 0 + ORDER BY sumAddCredit desc + + + + + + + +