用户地址相关接口代码调整

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

@@ -83,4 +83,7 @@ public class UserAddressAddDto {
     @NotNull(message = "地址是否默认不能为空")
     @ApiModelProperty("地址是否默认 1：默认 0：非默认")
     private Integer isDefault;
+
+    @ApiModelProperty("地区")
+    private String atlasAdd;
 }

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

@@ -20,7 +20,6 @@ public class UserAddressDto {
     @ApiModelProperty("微信openId")
     private String openId;
 
-    @NotBlank(message = "城市编码不能为空")
     @ApiModelProperty("城市编码")
     private String cityCode;
 

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

@@ -76,4 +76,7 @@ public class UserAddressUpdateDto {
     @ApiModelProperty("门牌号")
     private String roomNumber;
 
+    @ApiModelProperty("地区")
+    private String atlasAdd;
+
 }

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

@@ -69,7 +69,8 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
         LambdaQueryWrapper<TAddress> objectLambdaQueryWrapper = new LambdaQueryWrapper<>();
         objectLambdaQueryWrapper.eq(TAddress::getOpenid, openId)
                 .eq(TAddress::getUserType, userType)
-                .eq(TAddress::getCityCode,cityCode)
+                // cityCode不为null才添加eq条件
+                .and(StrUtil.isNotBlank(cityCode), w -> w.eq(TAddress::getCityCode, cityCode))
                 .eq(TAddress::getIsDelete,0)
                 .orderByDesc(TAddress::getCreateTime);
         return this.list(objectLambdaQueryWrapper);

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

@@ -218,7 +218,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements Ar
             throw new ServiceException(ERROR_MSG_CITY_NOT_FOUND);
         }
 
-        return new CityInfoVo(area.getName(), area.getCode());
+        return new CityInfoVo(area.getName(), area.getCode(),addressComponent.getProvince(),addressComponent.getDistrict());
     }
 
     /**

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/CityInfoVo.java

@@ -16,4 +16,10 @@ public class CityInfoVo {
     @ApiModelProperty("城市区域码")
     private String cityCode;
 
+    @ApiModelProperty("省名称")
+    private String provinceName;
+
+    @ApiModelProperty("区名称")
+    private String districtName;
+
 }