From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji

---
 server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
index ed01544..a1447ef 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java
@@ -3,10 +3,12 @@
 import com.doumee.core.model.PageData;
 import com.doumee.core.model.PageWrap;
 import com.doumee.dao.business.model.Areas;
+import com.doumee.dao.business.model.Integral;
 import com.doumee.dao.business.model.Member;
 import com.doumee.dao.system.dto.MemberRechargeDTO;
 import com.doumee.dao.web.dto.MemberOwnDTO;
 import com.doumee.dao.web.dto.shop.Position;
+import com.doumee.dao.web.request.UpdMobileRequest;
 import com.doumee.dao.web.request.UpdateMemberRequest;
 import com.doumee.dao.web.request.WxPhoneRequest;
 import com.doumee.dao.web.response.AccountResponse;
@@ -125,27 +127,36 @@
      * @param code
      * @return
      */
-    AccountResponse wxLogin(String code,Integer recId);
+    AccountResponse wxLogin(String code);
 
 
-    AccountResponse wxLoginTest( Integer recId);
+//    AccountResponse wxLoginTest( Integer recId);
 
 
     /**
      * 鑾峰彇缁戝畾寰俊鐢ㄦ埛鎵嬫満鍙�
      * @param wxPhoneRequest
      */
-    void wxPhone(WxPhoneRequest wxPhoneRequest);
+    AccountResponse wxPhone(WxPhoneRequest wxPhoneRequest);
 
 
     /**
      * 鏇存柊寰俊鐢ㄦ埛淇℃伅
      * @param updateMemberRequest
      */
-    Member updateMember(UpdateMemberRequest updateMemberRequest);
+    void updateMember(UpdateMemberRequest updateMemberRequest);
 
+    /**
+     * 楠岃瘉鎵嬫満鍙�
+     * @param request
+     */
+    void verifyUserPhone(UpdMobileRequest request);
 
-
+    /**
+     * 鎹㈢粦鎵嬫満鍙�
+     * @param request
+     */
+    void updateUserPhone(UpdMobileRequest request);
 
     MemberOwnDTO getMemberOwnDTO(Integer memberId);
 
@@ -183,4 +194,10 @@
      * @return
      */
     Integer changeMemberRechargeBatch(MemberRechargeDTO memberRechargeDTO);
+
+    void updateShop(Member member);
+
+    void logOut(String token,Integer memberId);
+
+    void logOff(String token,Integer memberId);
 }

--
Gitblit v1.9.3