Merge remote-tracking branch 'origin/dev' into dev

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-admin/src/main/java/com/ylx/web/controller/massage/TAddressController.java → nightFragrance-massage/src/main/java/com/ylx/address/controller/TAddressController.java

@@ -1,4 +1,4 @@
-package com.ylx.web.controller.massage;
+package com.ylx.address.controller;
 
 
 import com.alibaba.fastjson.JSON;
@@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.controller.BaseController;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.utils.StringUtils;
-import com.ylx.massage.domain.TAddress;
+import com.ylx.address.domain.TAddress;
 import com.ylx.massage.domain.vo.MerchantCurrentAddressVO;
 import com.ylx.massage.domain.vo.UserAddressListVO;
-import com.ylx.massage.service.TAddressService;
+import com.ylx.address.service.TAddressService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/controller/UserAddressController.java → nightFragrance-massage/src/main/java/com/ylx/address/controller/UserAddressController.java

@@ -1,4 +1,4 @@
-package com.ylx.useradress.domain.controller;
+package com.ylx.address.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ylx.common.core.domain.R;
@@ -7,12 +7,12 @@ import com.ylx.common.core.domain.model.aliyun.SendSmsComponents;
 import com.ylx.common.core.domain.model.aliyun.SendSmsEnum;
 import com.ylx.common.utils.StringUtils;
 import com.ylx.massage.domain.vo.Result;
-import com.ylx.massage.service.TAddressService;
-import com.ylx.useradress.domain.dto.UserAddressAddDto;
-import com.ylx.useradress.domain.dto.UserAddressDeleteDto;
-import com.ylx.useradress.domain.dto.UserAddressDto;
-import com.ylx.useradress.domain.dto.UserAddressUpdateDto;
-import com.ylx.useradress.domain.vo.UserAddressVo;
+import com.ylx.address.service.TAddressService;
+import com.ylx.address.domain.dto.UserAddressAddDto;
+import com.ylx.address.domain.dto.UserAddressDeleteDto;
+import com.ylx.address.domain.dto.UserAddressDto;
+import com.ylx.address.domain.dto.UserAddressUpdateDto;
+import com.ylx.address.domain.vo.UserAddressVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TAddress.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/TAddress.java

@@ -1,11 +1,10 @@
-package com.ylx.massage.domain;
+package com.ylx.address.domain;
 
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ylx.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/dto/UserAddressAddDto.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/dto/UserAddressAddDto.java

@@ -1,4 +1,4 @@
-package com.ylx.useradress.domain.dto;
+package com.ylx.address.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/dto/UserAddressDeleteDto.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/dto/UserAddressDeleteDto.java

@@ -1,4 +1,4 @@
-package com.ylx.useradress.domain.dto;
+package com.ylx.address.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/dto/UserAddressDto.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/dto/UserAddressDto.java

@@ -1,4 +1,4 @@
-package com.ylx.useradress.domain.dto;
+package com.ylx.address.domain.dto;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/dto/UserAddressUpdateDto.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/dto/UserAddressUpdateDto.java

@@ -1,4 +1,4 @@
-package com.ylx.useradress.domain.dto;
+package com.ylx.address.domain.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;

nightFragrance-massage/src/main/java/com/ylx/useradress/domain/vo/UserAddressVo.java → nightFragrance-massage/src/main/java/com/ylx/address/domain/vo/UserAddressVo.java

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

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TAddressMapper.java → nightFragrance-massage/src/main/java/com/ylx/address/mapper/TAddressMapper.java

@@ -1,9 +1,9 @@
-package com.ylx.massage.mapper;
+package com.ylx.address.mapper;
 
 import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ylx.massage.domain.TAddress;
+import com.ylx.address.domain.TAddress;
 import com.ylx.massage.domain.vo.MerchantCurrentAddressVO;
 import com.ylx.massage.domain.vo.UserAddressListVO;
 import org.apache.ibatis.annotations.Param;

nightFragrance-massage/src/main/java/com/ylx/massage/service/TAddressService.java → nightFragrance-massage/src/main/java/com/ylx/address/service/TAddressService.java

@@ -1,14 +1,14 @@
-package com.ylx.massage.service;
+package com.ylx.address.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ylx.massage.domain.TAddress;
+import com.ylx.address.domain.TAddress;
 import com.ylx.massage.domain.vo.MerchantCurrentAddressVO;
 import com.ylx.massage.domain.vo.UserAddressListVO;
-import com.ylx.useradress.domain.dto.UserAddressAddDto;
-import com.ylx.useradress.domain.dto.UserAddressDeleteDto;
-import com.ylx.useradress.domain.dto.UserAddressDto;
-import com.ylx.useradress.domain.dto.UserAddressUpdateDto;
-import com.ylx.useradress.domain.vo.UserAddressVo;
+import com.ylx.address.domain.dto.UserAddressAddDto;
+import com.ylx.address.domain.dto.UserAddressDeleteDto;
+import com.ylx.address.domain.dto.UserAddressDto;
+import com.ylx.address.domain.dto.UserAddressUpdateDto;
+import com.ylx.address.domain.vo.UserAddressVo;
 
 import java.util.List;
 

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

@@ -1,4 +1,4 @@
-package com.ylx.massage.service.impl;
+package com.ylx.address.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -11,15 +11,15 @@ 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.useradress.domain.dto.UserAddressAddDto;
-import com.ylx.useradress.domain.dto.UserAddressDeleteDto;
-import com.ylx.useradress.domain.dto.UserAddressDto;
-import com.ylx.useradress.domain.dto.UserAddressUpdateDto;
-import com.ylx.useradress.domain.vo.UserAddressVo;
-import com.ylx.massage.mapper.TAddressMapper;
-import com.ylx.massage.domain.TAddress;
-import com.ylx.massage.service.TAddressService;
+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;
+import com.ylx.address.domain.dto.UserAddressUpdateDto;
+import com.ylx.address.domain.vo.UserAddressVo;
+import com.ylx.address.mapper.TAddressMapper;
+import com.ylx.address.domain.TAddress;
+import com.ylx.address.service.TAddressService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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;

nightFragrance-massage/src/main/java/com/ylx/fareSetting/service/impl/MaProjectFareSettingServiceImpl.java

@@ -13,11 +13,10 @@ import com.ylx.fareSetting.domian.dto.FareCalculateDTO;
 import com.ylx.fareSetting.domian.vo.FareCalculateResultVO;
 import com.ylx.fareSetting.mapper.MaProjectFareSettingMapper;
 import com.ylx.fareSetting.service.IMaProjectFareSettingService;
-import com.ylx.massage.domain.TAddress;
-import com.ylx.massage.domain.TFareFreeRule;
+import com.ylx.address.domain.TAddress;
 import com.ylx.massage.domain.dto.DriverFeeDTO;
 import com.ylx.massage.domain.vo.TFareSettingVo;
-import com.ylx.massage.service.TAddressService;
+import com.ylx.address.service.TAddressService;
 import com.ylx.massage.service.TFareSettingService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ylx.address.domain.TAddress;
+import com.ylx.address.mapper.TAddressMapper;
 import com.ylx.attendanceconfig.domain.AttendanceRule;
 import com.ylx.attendanceconfig.mapper.AttendanceRuleMapper;
 import com.ylx.collect.service.CollectService;
@@ -23,7 +25,7 @@ import com.ylx.massage.domain.vo.*;
 import com.ylx.massage.enums.*;
 import com.ylx.massage.mapper.*;
 import com.ylx.massage.service.IMaTechnicianService;
-import com.ylx.massage.service.TAddressService;
+import com.ylx.address.service.TAddressService;
 import com.ylx.merchant.domain.dto.MerchantDetailDTO;
 import com.ylx.merchant.domain.dto.MerchantListDTO;
 import com.ylx.merchant.domain.dto.MerchantProjectDTO;

nightFragrance-massage/src/main/java/com/ylx/order/service/impl/TOrderServiceImpl.java

@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
+import com.ylx.address.domain.TAddress;
+import com.ylx.address.service.TAddressService;
 import com.ylx.common.core.domain.R;
 import com.ylx.common.core.domain.entity.SysDictData;
 import com.ylx.common.core.domain.model.WxLoginUser;

nightFragrance-massage/src/main/resources/mapper/massage/TAddressMapper.xml → nightFragrance-massage/src/main/resources/mapper/address/TAddressMapper.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ylx.massage.mapper.TAddressMapper">
+<mapper namespace="com.ylx.address.mapper.TAddressMapper">
 
-    <resultMap type="com.ylx.massage.domain.TAddress" id="TAddressMap">
+    <resultMap type="com.ylx.address.domain.TAddress" id="TAddressMap">
         <result property="id" column="id" jdbcType="VARCHAR"/>
         <result property="openid" column="openid" jdbcType="VARCHAR"/>
         <result property="userId" column="user_id" jdbcType="VARCHAR"/>

nightFragrance-massage/src/test/java/com/ylx/massage/mapper/TAddressMapperXmlTest.java

@@ -51,7 +51,7 @@ public class TAddressMapperXmlTest {
 
     private String readMapperXml() throws Exception {
         try (InputStream inputStream = getClass().getClassLoader()
-                .getResourceAsStream("mapper/massage/TAddressMapper.xml")) {
+                .getResourceAsStream("mapper/address/TAddressMapper.xml")) {
             assertNotNull(inputStream, "TAddressMapper.xml should exist in test classpath");
             byte[] bytes = new byte[inputStream.available()];
             inputStream.read(bytes);

nightFragrance-massage/src/test/java/com/ylx/massage/service/impl/TAddressServiceImplTest.java

@@ -2,9 +2,10 @@ package com.ylx.massage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
-import com.ylx.massage.domain.TAddress;
+import com.ylx.address.service.impl.TAddressServiceImpl;
+import com.ylx.address.domain.TAddress;
 import com.ylx.massage.domain.vo.MerchantCurrentAddressVO;
-import com.ylx.massage.mapper.TAddressMapper;
+import com.ylx.address.mapper.TAddressMapper;
 import org.apache.ibatis.builder.MapperBuilderAssistant;
 import org.apache.ibatis.session.Configuration;
 import org.junit.jupiter.api.Test;