From 761d13616d43b147142d7d33da3a646f6ac15397 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 27 四月 2026 22:25:29 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 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 b73f56c..6b5c5cc 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
@@ -46,9 +46,12 @@
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -332,7 +335,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);
@@ -440,16 +443,40 @@
     public PlatformAboutVO getPlatformAboutUs(){
         PlatformAboutVO vo = new PlatformAboutVO();
         vo.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
-        vo.setUserAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.USER_AGREEMENT).getCode()));
-        vo.setPrivacyAgreement(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PRIVACY_AGREEMENT).getCode()));
-        vo.setServerIntroduce(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SERVER_INTRODUCE).getCode()));
+        vo.setStoreRiskCommitment(getDictValue(Constants.STORE_RISK_COMMITMENT));
+        vo.setStoreCooperationAgreement(getDictValue(Constants.STORE_COOPERATION_AGREEMENT));
+        vo.setStoreLuggageStorageNotice(getDictValue(Constants.STORE_LUGGAGE_STORAGE_NOTICE));
+        vo.setStorePrivacyPolicy(getDictValue(Constants.STORE_PRIVACY_POLICY));
+        vo.setOwnerLuggageStorageNotice(getDictValue(Constants.OWNER_LUGGAGE_STORAGE_NOTICE));
+        vo.setOwnerServiceAgreement(getDictValue(Constants.OWNER_SERVICE_AGREEMENT));
+        vo.setOwnerRiskCommitment(getDictValue(Constants.OWNER_RISK_COMMITMENT));
+        vo.setErrandRiskCommitment(getDictValue(Constants.ERRAND_RISK_COMMITMENT));
+        vo.setErrandServiceAgreement(getDictValue(Constants.ERRAND_SERVICE_AGREEMENT));
+        vo.setErrandLuggageStorageNotice(getDictValue(Constants.ERRAND_LUGGAGE_STORAGE_NOTICE));
+        vo.setUserServiceAgreement(getDictValue(Constants.USER_SERVICE_AGREEMENT));
+        vo.setUserPrivacyPolicy(getDictValue(Constants.USER_PRIVACY_POLICY));
+        vo.setDriverPrivacyPolicy(getDictValue(Constants.DRIVER_PRIVACY_POLICY));
+        vo.setPriceDescription(getDictValue(Constants.PRICE_DESCRIPTION));
+        vo.setProhibitedItems(getDictValue(Constants.PROHIBITED_ITEMS));
         return vo;
     }
 
+    private String getDictValue(String key) {
+        try {
+            return StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM, key).getCode());
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
     @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