From 9e0dfce91096989056aaa9bb02e946d6e06465a5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 15:15:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index 75ae96d..1db293e 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.erp.model.openapi.response.AccessTokenResponse;
import com.doumee.dao.admin.request.LaborEmpowerDTO;
import com.doumee.dao.admin.request.LaborMemberDTO;
import com.doumee.dao.admin.request.MemberQuery;
@@ -58,6 +59,8 @@
*/
void deleteByIdInBatch(List<Integer> ids);
+ void batchBlock(List<Integer> ids);
+
/**
* 涓婚敭鏇存柊
*
@@ -72,6 +75,10 @@
* @param member 瀹炰綋瀵硅薄
*/
void updateStatusById(Member member);
+
+ void updateVisitsStatusById(Member member);
+
+ void updateRemoveStatusById(List<Member> members);
void updateCanVisitById(Member member);
/**
@@ -148,8 +155,14 @@
*/
PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+ /**
+ * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
+ */
+ void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -163,7 +176,6 @@
MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
-
--
Gitblit v1.9.3