From 3b759ef71bb48f9bb6f8445770d20e8ea7921788 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 06 一月 2026 13:58:14 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/MemberService.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 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 796bded..949903c 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,21 +1,21 @@
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.core.jiandaoyun.model.request.MemberPushData;
+import com.doumee.dao.web.response.DDAuthorizeVO;
+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.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 com.taobao.api.ApiException;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -169,24 +169,23 @@
void registerDriver(RegisterDriverDTO registerDriverDTO);
/**
+ * 鍚屾绠�鍗曚簯鐢ㄦ埛
+ * @return
+ */
+ String syncJdyUserInfo();
+ /**
* 寰俊鎺堟潈鎺ュ彛
* @param code
* @return
*/
- WxAuthorizeVO wxAuthorize(String code);
+ WxAuthorizeVO wxAuthorize(String code,Integer source);
+ DDAuthorizeVO ddAuthorize(String code, Integer source) throws ApiException;
List<MemberVO> getVisitedMember(CheckVisitedDTO checkVisitedDTO);
- /**
- * 璐﹀彿瀵嗙爜
- * 鍐呴儴浜哄憳/鍔冲姟璁垮鐧诲綍
- * @param accountLoginDTO
- * @return
- */
- WxAuthorizeVO accountLogin(AccountLoginDTO accountLoginDTO);
/**
* 鍐呴儴鍙嫓璁夸汉鍛樺垎椤�
@@ -215,5 +214,15 @@
String importBatch(MultipartFile file, Integer companyType,LoginUserInfo loginUser);
+ List<Member> findDriveList(Member model);
+ void initPinyinTool();
+
+ void syncDDUserInfo() ;
+
+ void ddPushMemberInfo(String eventType, shade.com.alibaba.fastjson2.JSONObject eventData) ;
+
+ void dealJdyMemberInfo(MemberPushData data);
+
+ void sendMemberInfoResult(String username, String info, int status);
}
--
Gitblit v1.9.3