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/service/VolunteerMerchantService.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java
index 7e1d1f7..f06f38c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/VolunteerMerchantService.java
@@ -2,26 +2,48 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.VolunteerTypeVO;
+import com.panzhihua.common.model.vos.community.VolunteerMerchantVO;
 import com.panzhihua.service_community.entity.VolunteerMerchant;
-import com.panzhihua.service_community.entity.VolunteerType;
+import org.apache.ibatis.annotations.Param;
 
 public interface VolunteerMerchantService extends IService<VolunteerMerchant>
 {
+
+
+
+    R getById(String id);
     /**
      * 分页查询
      * @param
      * @return
      */
-    R volunteerMerchantGetList(int pageNum,int pageSize,String type);
+    R volunteerMerchantGetList(int pageNum,int pageSize,
+                               String merchantState,
+                               String merchantType,
+                               String name,
+                               String communityId);
     /**
      * 新增
      * @param
      * @return
      */
-    R insertVolunteerMerchant(VolunteerTypeVO volunteerTypeVO);
+    R insertVolunteerMerchant(VolunteerMerchantVO vtvo);
 
-    R updateVolunteerMerchant(VolunteerTypeVO volunteerTypeVO);
+    R updateVolunteerMerchant(VolunteerMerchantVO vtvo);
 
     R deleteVolunteerMerchant(String id);
+
+    /**
+     * 判断是否是商家
+     * @param userId
+     * @return
+     */
+    R isMerchant(@Param("userId") String userId);
+    /**
+     * 根据电话号码  或者姓名查询用户
+     * @param
+     * @return
+     */
+    R getUser(String communityId,String userName,String userPhone);
+
 }

--
Gitblit v1.7.1