From 75206d4e4ecd2a7789a21362b85906463d3f2c3d Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期一, 27 十二月 2021 10:08:13 +0800
Subject: [PATCH] Merge branch 'master' into hemenkou_dev

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
index e93858c..964310f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java
@@ -2,10 +2,14 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.panzhihua.common.model.dtos.PageBaseDTO;
 import com.panzhihua.common.model.dtos.community.convenient.ExportMerchantDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PageClassifyMerchantDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PageConvenientMerchantDTO;
+import com.panzhihua.common.model.dtos.community.convenient.PagePopularMerchantDTO;
 import com.panzhihua.common.model.dtos.community.convenient.PageSearchDTO;
+import com.panzhihua.common.model.vos.community.StatisticsCommVO;
+import com.panzhihua.common.model.vos.community.bigscreen.BigScreenMerchantStatisticsInfo;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientConsultationStatisticsVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO;
 import com.panzhihua.common.model.vos.community.convenient.ConvenientViewStatisticsVO;
@@ -50,6 +54,8 @@
      * @return
      */
     ConvenientMerchantVO selectMerchantById(@Param("merchantId") Long merchantId);
+
+    List<ConvenientMerchantVO> selectMerchantByName(@Param("communityId") Long communityId, @Param("currentMon") String currentMon);
 
     /**
      * 获取社区下热门商家
@@ -122,4 +128,29 @@
      * @return
      */
     int batchUpdateBusinessStatus(@Param("convenientMerchantDOList") List<ConvenientMerchantDO> convenientMerchantDOList, @Param("status") int status);
+
+    /**
+     * 社区商家
+     * @param communityId
+     * @return
+     */
+    List<ConvenientMerchantVO> selectMerchantListByCommunity(@Param("communityId") Long communityId);
+
+    /**
+     * 大屏分页获取热度排行商家
+     * @param page
+     * @param pagePopularMerchantDTO
+     * @return
+     */
+    List<ConvenientMerchantVO> getScreenPopularMerchants(@Param("page") Page page, @Param("pagePopularMerchantDTO") PagePopularMerchantDTO pagePopularMerchantDTO);
+
+    BigScreenMerchantStatisticsInfo getIndexMerchantBaseData(@Param("communityId") Long communityId);
+
+    List<StatisticsCommVO> selectServiceTypeCircleData(@Param("communityId") Long communityId);
+
+    List<StatisticsCommVO> getServiceTimesAddPolylineData(@Param("communityId") Long communityId);
+
+    StatisticsCommVO getServiceTimesTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
+
+    IPage<ConvenientMerchantVO> indexMerchantList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
 }

--
Gitblit v1.7.1