区域代码调整

nightFragrance-common/pom.xml

@@ -218,6 +218,11 @@
             <artifactId>wx-java-pay-spring-boot-starter</artifactId>
             <version>4.5.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.github.stuxuhai</groupId>
+            <artifactId>jpinyin</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

nightFragrance-massage/src/main/java/com/ylx/userhome/area/util/CityChineseUtil.java → nightFragrance-common/src/main/java/com/ylx/common/utils/CityChineseUtil.java

@@ -1,4 +1,4 @@
-package com.ylx.userhome.area.util;
+package com.ylx.common.utils;
 
 import com.github.stuxuhai.jpinyin.PinyinException;
 import com.github.stuxuhai.jpinyin.PinyinFormat;

nightFragrance-massage/pom.xml

@@ -53,10 +53,7 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>nightFragrance-framework</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.github.stuxuhai</groupId>
-            <artifactId>jpinyin</artifactId>
-        </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

nightFragrance-massage/src/main/java/com/ylx/address/service/impl/TAddressServiceImpl.java

@@ -11,7 +11,7 @@ import com.ylx.massage.domain.dto.CoordinateDTO;
 import com.ylx.massage.domain.vo.CityInfoVo;
 import com.ylx.massage.domain.vo.MerchantCurrentAddressVO;
 import com.ylx.massage.domain.vo.UserAddressListVO;
-import com.ylx.massage.service.AreaService;
+import com.ylx.area.service.AreaService;
 import com.ylx.address.domain.dto.UserAddressAddDto;
 import com.ylx.address.domain.dto.UserAddressDeleteDto;
 import com.ylx.address.domain.dto.UserAddressDto;

nightFragrance-massage/src/main/java/com/ylx/userhome/area/constants/CityCodeTypeEnum.java → nightFragrance-massage/src/main/java/com/ylx/area/constants/CityCodeTypeEnum.java

@@ -1,4 +1,4 @@
-package com.ylx.userhome.area.constants;
+package com.ylx.area.constants;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/AreaController.java → nightFragrance-massage/src/main/java/com/ylx/area/controller/AreaController.java

@@ -1,4 +1,4 @@
-package com.ylx.web.controller.massage;
+package com.ylx.area.controller;
 
 
 import cn.hutool.core.collection.CollectionUtil;
@@ -11,7 +11,7 @@ import com.ylx.massage.domain.Area;
 import com.ylx.massage.domain.dto.CoordinateDTO;
 import com.ylx.massage.domain.vo.AreaTreeNode;
 import com.ylx.massage.domain.vo.CityInfoVo;
-import com.ylx.massage.service.AreaService;
+import com.ylx.area.service.AreaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;

nightFragrance-massage/src/main/java/com/ylx/userhome/area/controller/CustomerCityController.java → nightFragrance-massage/src/main/java/com/ylx/area/controller/CustomerCityController.java

@@ -1,9 +1,9 @@
-package com.ylx.userhome.area.controller;
+package com.ylx.area.controller;
 
 import com.ylx.common.core.domain.R;
-import com.ylx.massage.service.AreaService;
+import com.ylx.area.service.AreaService;
 import com.ylx.massage.service.IMaTechnicianService;
-import com.ylx.userhome.area.domain.vo.CityVo;
+import com.ylx.area.domain.vo.CityVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nightFragrance-massage/src/main/java/com/ylx/userhome/area/domain/vo/CityVo.java → nightFragrance-massage/src/main/java/com/ylx/area/domain/vo/CityVo.java

@@ -1,4 +1,4 @@
-package com.ylx.userhome.area.domain.vo;
+package com.ylx.area.domain.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/AreaMapper.java → nightFragrance-massage/src/main/java/com/ylx/area/mapper/AreaMapper.java

@@ -1,4 +1,4 @@
-package com.ylx.massage.mapper;
+package com.ylx.area.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ylx.massage.domain.Area;

nightFragrance-massage/src/main/java/com/ylx/massage/service/AreaService.java → nightFragrance-massage/src/main/java/com/ylx/area/service/AreaService.java

@@ -1,11 +1,11 @@
-package com.ylx.massage.service;
+package com.ylx.area.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ylx.massage.domain.Area;
 import com.ylx.massage.domain.dto.CoordinateDTO;
 import com.ylx.massage.domain.vo.AreaTreeNode;
 import com.ylx.massage.domain.vo.CityInfoVo;
-import com.ylx.userhome.area.domain.vo.CityVo;
+import com.ylx.area.domain.vo.CityVo;
 
 import java.util.List;
 

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/AreaServiceImpl.java → nightFragrance-massage/src/main/java/com/ylx/area/service/impl/AreaServiceImpl.java

@@ -1,30 +1,26 @@
-package com.ylx.massage.service.impl;
+package com.ylx.area.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 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.ylx.common.config.AmapConfig;
-import com.ylx.common.core.domain.R;
 import com.ylx.common.exception.ServiceException;
 import com.ylx.common.utils.http.HttpUtils;
 import com.ylx.massage.domain.Area;
 import com.ylx.massage.domain.dto.CoordinateDTO;
 import com.ylx.massage.domain.vo.*;
-import com.ylx.massage.mapper.AreaMapper;
-import com.ylx.massage.service.AreaService;
-import com.ylx.userhome.area.constants.CityCodeTypeEnum;
-import com.ylx.userhome.area.domain.vo.CityVo;
-import com.ylx.userhome.area.util.CityChineseUtil;
+import com.ylx.area.mapper.AreaMapper;
+import com.ylx.area.service.AreaService;
+import com.ylx.area.constants.CityCodeTypeEnum;
+import com.ylx.area.domain.vo.CityVo;
+import com.ylx.common.utils.CityChineseUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;