From cf17c2f7012fc4351f66c71d66a4aa3a9fe9e34a Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 30 四月 2026 15:24:17 +0800
Subject: [PATCH] 代码生成

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberServiceImpl.java |   42 +++++++++++++++++++++++++++++++-----------
 1 files changed, 31 insertions(+), 11 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 3ac3d57..1d4bd15 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;
@@ -440,10 +443,30 @@
     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
@@ -496,13 +519,7 @@
                 queryWrapper.lambda().le(Member::getCreateTime, Utils.Date.getEnd(query.getEndTime()));
             }
         }
-        for (PageWrap.SortData sortData : pageWrap.getSorts()) {
-            if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
-                queryWrapper.orderByDesc(sortData.getProperty());
-            } else {
-                queryWrapper.orderByAsc(sortData.getProperty());
-            }
-        }
+        queryWrapper.lambda().orderByDesc(Member::getId);
         IPage<Member> memberPage = memberMapper.selectPage(page, queryWrapper);
         IPage<MemberListVO> voPage = memberPage.convert(this::toListVO);
         return PageData.from(voPage);
@@ -608,7 +625,10 @@
             throw new BusinessException(ResponseStatus.BAD_REQUEST);
         }
         //鍒ゆ柇鏂版墜鏈哄彿鏄惁宸茶浣跨敤
-        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda().eq(Member::getTelephone,request.getPhone()))>Constants.ZERO){
+        if(memberMapper.selectCount(new QueryWrapper<Member>().lambda()
+                        .eq(Member::getDeleted,Constants.ZERO)
+                        .eq(Member::getUserType,Constants.ZERO)
+                .eq(Member::getTelephone,request.getPhone()))>Constants.ZERO){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧�,鏂版墜鏈哄彿宸茶缁戝畾,鏃犳硶杩涜鎹㈢粦锛�");
         }
         Member member = memberMapper.selectById(request.getMemberId());

--
Gitblit v1.9.3