From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 51 ++++++++++++++++++++++++++++++---------------------
1 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
index d9cb5dd..03fd6bc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -1,18 +1,22 @@
package com.doumee.service.business;
+import com.doumee.core.model.LoginUserInfo;
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.dto.RegisterDriverDTO;
+import com.doumee.dao.business.dto.ResetPasswordDTO;
import com.doumee.dao.business.model.Member;
+import com.doumee.dao.business.model.MemberRole;
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 org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -44,9 +48,9 @@
*
* @param id 涓婚敭
*/
- void deleteById(Integer id);
+ void deleteById(Integer id,LoginUserInfo user);
- void roleAuthById(Integer id);
+ void roleAuthById(Integer id,LoginUserInfo user);
/**
* 鍒犻櫎
@@ -60,9 +64,10 @@
*
* @param ids 涓婚敭闆�
*/
- void deleteByIdInBatch(List<Integer> ids);
+ void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user);
- void batchBlock(List<Integer> ids,Integer type);
+ void batchBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
+ void batchRemoveBlock(List<Integer> ids, Integer type, LoginUserInfo loginUserInfo);
/**
* 涓婚敭鏇存柊
@@ -72,7 +77,6 @@
void updateById(Member member);
boolean updateFace(Member member);
-
/**
* 涓婚敭鏇存柊鍔冲姟浜哄憳鐘舵��
*
@@ -80,9 +84,6 @@
*/
void updateStatusById(Member member);
- void updateVisitsStatusById(Member member);
-
- void updateRemoveStatusById(List<Member> members);
void updateCanVisitById(Member member);
/**
@@ -127,14 +128,6 @@
/**
- * 鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ
- *
- * @param pageWrap 鍒嗛〉瀵硅薄
- * @return PageData<Member>
- */
- PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);
-
- /**
* 鏉′欢缁熻
*
* @param member 瀹炰綋瀵硅薄
@@ -157,11 +150,11 @@
* @param pageWrap
* @return
*/
- PageData<MemberInfoDTO> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findMemberInfoPage(PageWrap<MemberQuery> pageWrap);
- PageData<MemberInfoDTO> findVisitPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findVisitPage(PageWrap<MemberQuery> pageWrap);
- PageData<MemberInfoDTO> findUnusualPage(PageWrap<MemberQuery> pageWrap);
+ PageData<Member> findUnusualPage(PageWrap<MemberQuery> pageWrap);
/**
* 瀹氭椂鍐荤粨鍐呴儴浜哄憳
@@ -169,6 +162,11 @@
void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
+ /**
+ * 鍙告満娉ㄥ唽
+ * @param registerDriverDTO
+ */
+ void registerDriver(RegisterDriverDTO registerDriverDTO);
/**
* 寰俊鎺堟潈鎺ュ彛
@@ -179,7 +177,7 @@
- MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
+ List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
/**
@@ -207,4 +205,15 @@
void empowerByList(Member member);
void delHkForce(Member member);
+
+ void updateHead(Member member);
+
+ void updateWorkStatus(Member member);
+
+ void batchRoleAuth(Member memberRole);
+
+ String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser);
+
+
+ List<Member> findDriveList(Member model);
}
--
Gitblit v1.9.3