From 1c20c8231980a8d4b91688ff8641a06d3b2f68ab Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 14 十月 2025 16:34:22 +0800
Subject: [PATCH] 改bug
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 69 +++++++++++++++++-----------------
1 files changed, 35 insertions(+), 34 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 4236800..d425932 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,19 @@
package com.doumee.service.business;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.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.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 org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -29,7 +30,7 @@
* @param member 瀹炰綋瀵硅薄
* @return Integer
*/
- Integer create(Member member);
+ Member create(Member member);
/**
*
@@ -44,9 +45,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 +61,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);
/**
* 涓婚敭鏇存柊
@@ -70,8 +72,7 @@
* @param member 瀹炰綋瀵硅薄
*/
void updateById(Member member);
- void updateFace(Member member);
-
+ boolean updateFace(Member member);
/**
* 涓婚敭鏇存柊鍔冲姟浜哄憳鐘舵��
@@ -80,9 +81,6 @@
*/
void updateStatusById(Member member);
- void updateVisitsStatusById(Member member);
-
- void updateRemoveStatusById(List<Member> members);
void updateCanVisitById(Member member);
/**
@@ -127,14 +125,6 @@
/**
- * 鍒嗛〉鍔冲姟鐢ㄦ埛淇℃伅鏌ヨ
- *
- * @param pageWrap 鍒嗛〉瀵硅薄
- * @return PageData<Member>
- */
- PageData<MemberInfoDTO> findLaborMemberInfoPage(PageWrap<MemberInfoDTO> pageWrap);
-
- /**
* 鏉′欢缁熻
*
* @param member 瀹炰綋瀵硅薄
@@ -157,11 +147,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,26 +159,24 @@
void memberFreeze();
/********************************************鍏紬鍙锋帴鍙�***********************************************************************/
+ /**
+ * 鍙告満娉ㄥ唽
+ * @param registerDriverDTO
+ */
+ void registerDriver(RegisterDriverDTO registerDriverDTO);
/**
* 寰俊鎺堟潈鎺ュ彛
* @param code
* @return
*/
- WxAuthorizeVO wxAuthorize(String code);
+ WxAuthorizeVO wxAuthorize(String code,Integer source);
- MemberVO getVisitedMember(CheckVisitedDTO checkVisitedDTO);
+ List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
- /**
- * 璐﹀彿瀵嗙爜
- * 鍐呴儴浜哄憳/鍔冲姟璁垮鐧诲綍
- * @param accountLoginDTO
- * @return
- */
- WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);
/**
* 鍐呴儴鍙嫓璁夸汉鍛樺垎椤�
@@ -207,4 +195,17 @@
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);
+
+ void initPinyinTool();
}
--
Gitblit v1.9.3