From 70d2a5d0f9c6951b2d4cac954041ed73582ff7eb Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 09 六月 2025 11:54:00 +0800
Subject: [PATCH] 6.9新增登录失败冻结逻辑

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ConvenientMerchantDAO.java |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 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 964310f..f6c8e08 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
@@ -33,6 +33,7 @@
 public interface ConvenientMerchantDAO extends BaseMapper<ConvenientMerchantDO> {
     /**
      * 删除便民服务商家
+     *
      * @param merchantId
      * @param operator
      * @return
@@ -41,7 +42,8 @@
 
     /**
      * 分页查询便民服务商家 运营后台
-     * @param page 分页参数
+     *
+     * @param page                      分页参数
      * @param pageConvenientMerchantDTO
      * @return
      */
@@ -50,10 +52,19 @@
 
     /**
      * 查询商家信息
+     *
      * @param merchantId
      * @return
      */
     ConvenientMerchantVO selectMerchantById(@Param("merchantId") Long merchantId);
+
+    /**
+     * 根据后台用户id查询
+     *
+     * @param userId
+     * @return
+     */
+    ConvenientMerchantVO selectMerchantByUserId(@Param("userId") Long userId);
 
     List<ConvenientMerchantVO> selectMerchantByName(@Param("communityId") Long communityId, @Param("currentMon") String currentMon);
 
@@ -65,10 +76,11 @@
      * @param currentMon
      * @return
      */
-    IPage<ConvenientMerchantVO> getPopularMerchants(@Param("page") Page page, @Param("communityId") Long communityId, @Param("currentMon") String currentMon);
+    IPage<ConvenientMerchantVO> getPopularMerchants(@Param("page") Page page, @Param("communityId") Long communityId, @Param("currentMon") String currentMon, @Param("areaCode") String areaCode);
 
     /**
      * 获取指定类型的商家
+     *
      * @param page
      * @param pageClassifyMerchantDTO
      * @param currentMon
@@ -78,6 +90,7 @@
 
     /**
      * 获取商家详情
+     *
      * @param merchantId
      * @param currentMon
      * @return
@@ -86,6 +99,7 @@
 
     /**
      * 分页搜索商家信息
+     *
      * @param page
      * @param pageSearchDTO
      * @param currentMon
@@ -95,6 +109,7 @@
 
     /**
      * 根据查询条件获取商家导出数据
+     *
      * @param exportMerchantDTO
      * @return
      */
@@ -102,6 +117,7 @@
 
     /**
      * 批量更新商家咨询量
+     *
      * @param consultationVOList
      * @return
      */
@@ -109,6 +125,7 @@
 
     /**
      * 批量更新商家浏览量
+     *
      * @param viewVOList
      * @return
      */
@@ -116,6 +133,7 @@
 
     /**
      * 根据指定id获取商家导出数据
+     *
      * @param needExportIds
      * @return
      */
@@ -123,6 +141,7 @@
 
     /**
      * 批量更新商家营业状态
+     *
      * @param convenientMerchantDOList
      * @param status
      * @return
@@ -131,6 +150,7 @@
 
     /**
      * 社区商家
+     *
      * @param communityId
      * @return
      */
@@ -138,6 +158,7 @@
 
     /**
      * 大屏分页获取热度排行商家
+     *
      * @param page
      * @param pagePopularMerchantDTO
      * @return
@@ -153,4 +174,6 @@
     StatisticsCommVO getServiceTimesTotalPolylineDate(@Param("communityId") Long communityId, @Param("date") String date);
 
     IPage<ConvenientMerchantVO> indexMerchantList(@Param("page") Page page, @Param("pageBaseDTO") PageBaseDTO pageBaseDTO);
+
+    List<ConvenientMerchantVO> getMerchantDetailByAccount(@Param("account") String account);
 }

--
Gitblit v1.7.1