From 8b00bff78ba86989df613fcc7b09e7f64e135a52 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 29 二月 2024 11:43:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java |  110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 108 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 c2b507b..a329b1d 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
@@ -2,7 +2,18 @@
 
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
+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.admin.response.StagingDataVO;
 import com.doumee.dao.business.model.Member;
+import com.doumee.dao.web.reqeust.AccountLoginDTO;
+import com.doumee.dao.web.reqeust.CheckVisitedDTO;
+import com.doumee.dao.web.reqeust.VisitMemberDTO;
+import com.doumee.dao.web.response.MemberVO;
+import com.doumee.dao.web.response.WxAuthorizeVO;
+
 import java.util.List;
 
 /**
@@ -14,11 +25,19 @@
 
     /**
      * 鍒涘缓
-     * 
+     *
      * @param member 瀹炰綋瀵硅薄
      * @return Integer
      */
     Integer create(Member member);
+
+    /**
+     *
+     * 鍒涘缓鍔冲姟浜哄憳淇℃伅
+     * @param member
+     * @return
+     */
+    Integer laborMemberCreate(LaborMemberDTO member);
 
     /**
      * 涓婚敭鍒犻櫎
@@ -41,6 +60,8 @@
      */
     void deleteByIdInBatch(List<Integer> ids);
 
+    void batchBlock(List<Integer> ids,Integer type);
+
     /**
      * 涓婚敭鏇存柊
      *
@@ -48,6 +69,19 @@
      */
     void updateById(Member member);
 
+
+    /**
+     * 涓婚敭鏇存柊鍔冲姟浜哄憳鐘舵��
+     *
+     * @param member 瀹炰綋瀵硅薄
+     */
+    void updateStatusById(Member member);
+
+    void updateVisitsStatusById(Member member);
+
+    void updateRemoveStatusById(List<Member> members);
+
+    void updateCanVisitById(Member member);
     /**
      * 鎵归噺涓婚敭鏇存柊
      *
@@ -78,7 +112,7 @@
      * @return List<Member>
      */
     List<Member> findList(Member member);
-  
+
     /**
      * 鍒嗛〉鏌ヨ
      *
@@ -87,6 +121,16 @@
      */
     PageData<Member> findPage(PageWrap<Member> pageWrap);
 
+
+
+    /**
+     * 鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ
+     *
+     * @param pageWrap 鍒嗛〉瀵硅薄
+     * @return PageData<Member>
+     */
+    PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);
+
     /**
      * 鏉′欢缁熻
      *
@@ -94,4 +138,66 @@
      * @return long
      */
     long count(Member member);
+
+
+    /**
+     * 瀵煎叆鍔冲姟浜哄憳闂ㄧ淇℃伅
+     * @param laborEmpowerDTO
+     * @return
+     */
+    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();
+    /********************************************鍏紬鍙锋帴鍙�***********************************************************************/
+
+
+    /**
+     * 寰俊鎺堟潈鎺ュ彛
+     * @param code
+     * @return
+     */
+    WxAuthorizeVO wxAuthorize(String code);
+
+
+
+    MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
+
+
+    /**
+     * 璐﹀彿瀵嗙爜
+     * 鍐呴儴浜哄憳/鍔冲姟璁垮鐧诲綍
+     * @param accountLoginDTO
+     * @return
+     */
+    WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);
+
+    /**
+     * 鍐呴儴鍙嫓璁夸汉鍛樺垎椤�
+     * @param param
+     * @return
+     */
+    PageData<MemberVO> getVisitedMemberList(PageWrap<VisitMemberDTO> param);
+
+    /**
+     * 琛ュ厖鏁版嵁
+     */
+    StagingDataVO stagingHead(StagingDataVO stagingHeadVO);
+
+    StagingDataVO stagingBody(StagingDataVO stagingHeadVO);
 }

--
Gitblit v1.9.3