From 98661dae111965b72b758a14d687b3218c2e2089 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 22 十二月 2023 15:38:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 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 8a281a4..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,10 +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;
@@ -55,6 +59,8 @@
*/
void deleteByIdInBatch(List<Integer> ids);
+ void batchBlock(List<Integer> ids);
+
/**
* 涓婚敭鏇存柊
*
@@ -70,6 +76,11 @@
*/
void updateStatusById(Member member);
+ void updateVisitsStatusById(Member member);
+
+ void updateRemoveStatusById(List<Member> members);
+
+ void updateCanVisitById(Member member);
/**
* 鎵归噺涓婚敭鏇存柊
*
@@ -136,8 +147,22 @@
void importMemberBatch(LaborEmpowerDTO laborEmpowerDTO);
+ /**
+ *
+ * 鍒嗛〉鏌ヨ鍐呴儴浜哄憳淇℃伅
+ * @param pageWrap
+ * @return
+ */
+ PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+
+ /**
+ * 瀹氭椂鍐荤粨鍐呴儴浜哄憳
+ */
+ void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
@@ -150,8 +175,7 @@
-
-
+ MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
--
Gitblit v1.9.3