From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java | 52 ++++++++++++++++++++++++----------------------------
1 files changed, 24 insertions(+), 28 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 87d3de3..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,6 +46,7 @@
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;
@@ -442,37 +443,32 @@
public PlatformAboutVO getPlatformAboutUs(){
PlatformAboutVO vo = new PlatformAboutVO();
vo.setAboutUs(StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.ABOUT_US).getCode()));
-
- Map<String, String> agreements = new LinkedHashMap<>();
- String[] agreementKeys = {
- Constants.STORE_RISK_COMMITMENT,
- Constants.STORE_COOPERATION_AGREEMENT,
- Constants.STORE_LUGGAGE_STORAGE_NOTICE,
- Constants.STORE_PRIVACY_POLICY,
- Constants.OWNER_LUGGAGE_STORAGE_NOTICE,
- Constants.OWNER_SERVICE_AGREEMENT,
- Constants.OWNER_RISK_COMMITMENT,
- Constants.ERRAND_RISK_COMMITMENT,
- Constants.ERRAND_SERVICE_AGREEMENT,
- Constants.ERRAND_LUGGAGE_STORAGE_NOTICE,
- Constants.USER_SERVICE_AGREEMENT,
- Constants.USER_PRIVACY_POLICY,
- Constants.DRIVER_PRIVACY_POLICY,
- Constants.PRICE_DESCRIPTION,
- Constants.PROHIBITED_ITEMS
- };
- for (String key : agreementKeys) {
- try {
- String value = StringUtils.trimToNull(systemDictDataBiz.queryByCode(Constants.SYSTEM, key).getCode());
- agreements.put(key, value);
- } catch (Exception e) {
- agreements.put(key, null);
- }
- }
- vo.setAgreements(agreements);
+ 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 userId,Integer userType){
if(Constants.equalsInteger(userType,Constants.ZERO)){
--
Gitblit v1.9.3