From 9576bebcacea938771f6f5b51d958e6a4ac59df6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 09 十二月 2021 16:59:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 80e8486..600e5de 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
@@ -36,7 +36,7 @@
int deleteMerchantById(@Param("merchantId") Long merchantId, @Param("operator") Long operator);
/**
- * 分页查询便民服务商家
+ * 分页查询便民服务商家 运营后台
* @param page 分页参数
* @param pageConvenientMerchantDTO
* @return
@@ -50,6 +50,8 @@
* @return
*/
ConvenientMerchantVO selectMerchantById(@Param("merchantId") Long merchantId);
+
+ List<ConvenientMerchantVO> selectMerchantByName(@Param("communityId") Long communityId, @Param("currentMon") String currentMon);
/**
* 获取社区下热门商家
@@ -88,11 +90,11 @@
IPage<ConvenientMerchantVO> pageSearchMerchant(@Param("page") Page page, @Param("pageSearchDTO") PageSearchDTO pageSearchDTO, @Param("currentMon") String currentMon);
/**
- * 获取商家导出数据
+ * 根据查询条件获取商家导出数据
* @param exportMerchantDTO
* @return
*/
- List<ExportMerchantVO> exportMerchant(@Param("exportMerchantDTO") ExportMerchantDTO exportMerchantDTO);
+ List<ExportMerchantVO> exportMerchantBySearch(@Param("exportMerchantDTO") ExportMerchantDTO exportMerchantDTO);
/**
* 批量更新商家咨询量
@@ -107,4 +109,19 @@
* @return
*/
int batchUpdateMerchantViewNum(@Param("viewVOList") List<ConvenientViewStatisticsVO> viewVOList);
+
+ /**
+ * 根据指定id获取商家导出数据
+ * @param needExportIds
+ * @return
+ */
+ List<ExportMerchantVO> exportMerchantByIds(@Param("needExportIds") List<Long> needExportIds);
+
+ /**
+ * 批量更新商家营业状态
+ * @param convenientMerchantDOList
+ * @param status
+ * @return
+ */
+ int batchUpdateBusinessStatus(@Param("convenientMerchantDOList") List<ConvenientMerchantDO> convenientMerchantDOList, @Param("status") int status);
}
--
Gitblit v1.7.1