From c1e48a47b39dbd6919bfd9cf2e7023e9f3d6fee8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 05 十一月 2021 10:24:21 +0800
Subject: [PATCH] 1105测试代码修改

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java |   21 ++++++++++++++++++---
 1 files changed, 18 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..e93858c 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
@@ -88,11 +88,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 +107,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