From 452d9c350233e35e66545d77938a93addcc39716 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 九月 2021 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
index 910f394..73935b2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ConvenientMerchantServiceImpl.java
@@ -252,12 +252,10 @@
         SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd");
         String moth = mothFormat.format(nowDate);
         String day = dayFormat.format(nowDate);
-        int consultationCount = convenientConsultationStatisticsDAO.selectCount(new QueryWrapper<ConvenientConsultationStatisticsDO>()
-                .lambda().eq(ConvenientConsultationStatisticsDO::getMerchantId, merchantId));
+        int consultationCount = convenientConsultationStatisticsDAO.selectTotalConsultationVolume(merchantId);
         int monthConsultationVolume = convenientConsultationStatisticsDAO.selectMonthConsultationVolume(merchantId, moth);
         int dayConsultationVolume = convenientConsultationStatisticsDAO.selectDayConsultationVolume(merchantId, day);
-        Integer viewCount = convenientViewStatisticsDAO.selectCount(new QueryWrapper<ConvenientViewStatisticsDO>()
-                .lambda().eq(ConvenientViewStatisticsDO::getMerchantId, merchantId));
+        Integer viewCount = convenientViewStatisticsDAO.selectTotalViewNum(merchantId);
         int monthViewNum = convenientViewStatisticsDAO.selectMonthViewNum(merchantId, moth);
         int dayViewNum = convenientViewStatisticsDAO.selectDayViewNum(merchantId, day);
         convenientMerchantVO.setConsultationVolume(consultationCount);

--
Gitblit v1.7.1