From a76e2318dd2731ff713df6e262396a9175d029f7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 13 二月 2026 09:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/MemberService.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 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 74b10eb..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,6 +3,7 @@
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;
@@ -126,24 +127,24 @@
* @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);
/**
* 楠岃瘉鎵嬫満鍙�
@@ -193,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