From 2ab42edae9d271f5f464b7be475e217752dacb38 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 22 四月 2026 09:24:47 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
index a4554eb..3ac3d57 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java
@@ -332,7 +332,7 @@
                 member.setReceiveNum(Constants.ZERO.longValue());
                 member.setPublishNum(Constants.ZERO.longValue());
                 member.setAutoReceiveStatus(Constants.ONE);
-                member.setUseIdentity(Constants.ZERO);
+                member.setUserType(Constants.ZERO);
                 memberMapper.insert(member);
             }
             String token = JwtTokenUtil.generateTokenForRedis(member.getId(), Constants.ZERO, JSONObject.toJSONString(member), redisTemplate);
@@ -350,15 +350,13 @@
      * 闂ㄥ簵鐢ㄦ埛韬唤鏃讹紝濉厖闂ㄥ簵瀹℃牳鐘舵��
      */
     private void fillShopInfo(UserCenterVO userCenterVO, Member member) {
-        if (Constants.TWO.equals(member.getUserType())) {
-            ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
-                    .eq(ShopInfo::getRegionMemberId, member.getId())
-                    .eq(ShopInfo::getDeleted, Constants.ZERO)
-                    .last("limit 1"));
-            if (shopInfo != null) {
-                userCenterVO.setShopId(shopInfo.getId());
-                userCenterVO.setShopAuditStatus(shopInfo.getAuditStatus());
-            }
+        ShopInfo shopInfo = shopInfoMapper.selectOne(new QueryWrapper<ShopInfo>().lambda()
+                .eq(ShopInfo::getRegionMemberId, member.getId())
+                .eq(ShopInfo::getDeleted, Constants.ZERO)
+                .last("limit 1"));
+        if (shopInfo != null) {
+            userCenterVO.setShopId(shopInfo.getId());
+            userCenterVO.setShopAuditStatus(shopInfo.getAuditStatus());
         }
         // 鏍规嵁openid鏌ヨ褰撳墠缁戝畾鐨勯棬搴�
         if (StringUtils.isNotBlank(member.getOpenid())) {
@@ -449,9 +447,13 @@
     }
 
     @Override
-    public void logOut(String token,Integer memberId){
-        memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" openid = null ").eq(Member::getId,memberId));
-        jwtTokenUtil.logoutForH5(token);
+    public void logOut(String token,Integer userId,Integer userType){
+        if(Constants.equalsInteger(userType,Constants.ZERO)){
+            memberMapper.update(new UpdateWrapper<Member>().lambda().setSql(" openid = null ").eq(Member::getId,userId));
+        }else if(Constants.equalsInteger(userType,Constants.TWO)){
+            shopInfoMapper.update(new UpdateWrapper<ShopInfo>().lambda().setSql(" openid = null ").eq(ShopInfo::getId,userId));
+        }
+        jwtTokenUtil.logout(token);
     }
 
 

--
Gitblit v1.9.3