From 70577a6d6cf2bded29e71dcad11a0c2605193d20 Mon Sep 17 00:00:00 2001
From: lishuai <260038442@qq.com>
Date: 星期二, 26 十二月 2023 10:32:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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 5078d2c..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,11 +3,14 @@
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;
import com.doumee.dao.admin.response.MemberInfoDTO;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+import com.doumee.dao.web.response.MemberVO;
import com.doumee.dao.web.response.WxAuthorizeVO;
import java.util.List;
@@ -56,6 +59,8 @@
*/
void deleteByIdInBatch(List<Integer> ids);
+ void batchBlock(List<Integer> ids);
+
/**
* 涓婚敭鏇存柊
*
@@ -71,6 +76,11 @@
*/
void updateStatusById(Member member);
+ void updateVisitsStatusById(Member member);
+
+ void updateRemoveStatusById(List<Member> members);
+
+ void updateCanVisitById(Member member);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -145,8 +155,14 @@
*/
PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+ /**
+ * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
+ */
+ void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -159,8 +175,7 @@
-
-
+ MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
--
Gitblit v1.9.3