From ffd3014f16d2f0857e0eaf32ceadea8d7f8c2e36 Mon Sep 17 00:00:00 2001
From: stivepeim <peimm126@126.com>
Date: Sat, 9 Oct 2021 15:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=AE=E4=BF=A1=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=9C=B0=E5=9D=80=E6=B2=A1=E6=9C=89cityID=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crmeb/system/service/SystemCityService.java  |  8 +++++++-
 .../service/impl/SystemCityServiceImpl.java      | 16 ++++++++++++++++
 .../service/impl/UserAddressServiceImpl.java     | 14 ++++++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemCityService.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemCityService.java
index 54ef2469..959a0e0a 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemCityService.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/SystemCityService.java
@@ -32,4 +32,10 @@ public interface SystemCityService extends IService<SystemCity> {
     List<Integer> getCityIdList();
 
     SystemCity getCityByCityId(Integer cityId);
-}
\ No newline at end of file
+    /**
+     * 根据城市名称获取城市详细数据
+     * @param cityName 城市名称
+     * @return 城市数据
+     */
+    SystemCity getCityByCityName(String cityName);
+}
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
index a99f43b8..2d8196d5 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/system/service/impl/SystemCityServiceImpl.java
@@ -1,6 +1,7 @@
 package com.zbkj.crmeb.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.constants.Constants;
 import com.utils.RedisUtil;
@@ -173,5 +174,20 @@ public class SystemCityServiceImpl extends ServiceImpl<SystemCityDao, SystemCity
     public void asyncRedis(Integer pid){
         systemCityAsyncService.async(pid);
     }
+
+    /**
+     * 根据城市名称获取城市详细数据
+     * @author 大粽子
+     * @param cityName 城市名称
+     * @return 城市数据
+     */
+    @Override
+    public SystemCity getCityByCityName(String cityName) {
+        LambdaQueryWrapper<SystemCity> systemCityLambdaQueryWrapper = Wrappers.lambdaQuery();
+        systemCityLambdaQueryWrapper
+                .eq(SystemCity::getName,cityName)
+                .eq(SystemCity::getIsShow,1);
+        return getOne(systemCityLambdaQueryWrapper);
+    }
 }
 
diff --git a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserAddressServiceImpl.java b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserAddressServiceImpl.java
index 1cb082b7..029edaac 100644
--- a/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserAddressServiceImpl.java
+++ b/crmeb/src/main/java/com/zbkj/crmeb/user/service/impl/UserAddressServiceImpl.java
@@ -1,5 +1,6 @@
 package com.zbkj.crmeb.user.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -88,7 +89,20 @@ public class UserAddressServiceImpl extends ServiceImpl<UserAddressDao, UserAddr
         userAddress.setCityId(request.getAddress().getCityId());
         userAddress.setDistrict(request.getAddress().getDistrict());
         userAddress.setProvince(request.getAddress().getProvince());
+        // 添加地址时cityId和城市名称不能同时为空，如果id为空，必须用城市名称自查后set CityId
+        if(request.getAddress().getCityId() == 0 && StringUtils.isBlank(request.getAddress().getCity())){
+            throw new CrmebException("请选择正确城市数据");
+        }
+        if(StringUtils.isNotBlank(request.getAddress().getCity()) && request.getAddress().getCityId() == 0){
+            SystemCity currentCity = systemCityService.getCityByCityName(request.getAddress().getCity());
+            if(ObjectUtil.isNull(currentCity)) throw new CrmebException("当前城市未找到！");
 
+            userAddress.setCityId(currentCity.getCityId());
+        }
+
+        //if(request.getAddress().getCityId() > 0 && StringUtils.isNotBlank(request.getAddress().getCity())){
+        checkCity(userAddress.getCityId());
+        //}
         if(request.getAddress().getCityId() > 0 && StringUtils.isNotBlank(request.getAddress().getCity())){
             checkCity(userAddress.getCityId());
         }