修改了切换地址接口

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TAddressController.java

@@ -165,7 +165,7 @@ public class TAddressController extends BaseController {
 
 
     /**
-     * 新增虚拟地址（技师端）
+     * 新增虚拟地址（商户端）
      *
      * @param tAddress 实体对象
      * @return R 新增结果

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TechnicianMomentController.java

@@ -249,7 +249,7 @@ public class TechnicianMomentController extends BaseController {
     }
 
     /**
-     * 查询我的动态列表（已发布的动态：审核中+审核通过）
+     * 查询我的动态列表（已发布的动态：审核中+审核通过+审核拒绝）
      *
      * @param pageNum  页码
      * @param pageSize 每页数量
@@ -257,9 +257,7 @@ public class TechnicianMomentController extends BaseController {
      */
     @GetMapping("/my")
     @ApiOperation("查询我的动态列表")
-    public R<Page<MyMomentVO>> getMyMoments(
-            @ApiParam("页码") @RequestParam(defaultValue = "1") Integer pageNum,
-            @ApiParam("每页数量") @RequestParam(defaultValue = "10") Integer pageSize) {
+    public R<Page<MyMomentVO>> getMyMoments(@ApiParam("页码") @RequestParam(defaultValue = "1") Integer pageNum, @ApiParam("每页数量") @RequestParam(defaultValue = "10") Integer pageSize) {
         try {
             // 获取当前登录用户信息
             WxLoginUser wxLoginUser = getWxLoginUser();

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

@@ -71,15 +71,22 @@ public class TAddress extends Model<TAddress> {
     //纬度
     @ApiModelProperty("纬度")
     private BigDecimal latitude;
-    //地址
+
+    /**
+     * 地址
+     */
     @ApiModelProperty("地址")
     private String address;
 
-    //详细地址(地址+门牌号)
+    /**
+     * 详细地址(地址+门牌号)
+     */
     @ApiModelProperty("详细地址")
     private String detailAddress;
 
-    //门牌号
+    /**
+     * 门牌号
+     */
     @ApiModelProperty("门牌号")
     private String roomNumber;
 

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

@@ -10,9 +10,15 @@ import java.math.BigDecimal;
 @ApiModel(description = "经纬度查询dto")
 public class CoordinateDTO {
 
+    /**
+     * 经度
+     */
     @ApiModelProperty(value = "经度", required = true)
     private BigDecimal longitude;
 
+    /**
+     * 纬度
+     */
     @ApiModelProperty(value = "纬度", required = true)
     private BigDecimal latitude;
 

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

@@ -21,6 +21,11 @@ public interface AreaService extends IService<Area> {
 
     List<AreaTreeNode> getProvinceCityTree();
 
+    /**
+     * 根据经纬度查询城市信息
+     * @param dto
+     * @return CityInfoVo
+     */
     CityInfoVo getCityInfoByCoordinates(CoordinateDTO dto);
 
     List<CityVo> getHomeList ();

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

@@ -40,7 +40,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements Ar
     private static final String AMAP_URL_PATTERN = "https://restapi.amap.com/v3/geocode/regeo?key=%s&location=%s,%s";
 
     private static final String AMAP_SUCCESS_STATUS = "1";
-    private static final String ERROR_MSG_API_KEY_MISSING = "配置文件中未找到或 app.amap-api-key 为空";
+    private static final String ERROR_MSG_API_KEY_MISSING = "配置文件中未找到或amap.apiKey 为空";
     private static final String ERROR_MSG_LOCATION_FAILED = "获取地理位置异常";
     private static final String ERROR_MSG_CITY_NOT_FOUND = "城市数据不存在";
     private static final int MAX_QUERY_RESULTS = 1;
@@ -197,6 +197,12 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements Ar
         return vo;
     }
 
+    /**
+     * 根据经纬度获取城市信息
+     *
+     * @param amapResponse
+     * @return CityInfoVo
+     */
     private CityInfoVo getCityInfo(AmapRegeoVo amapResponse) {
         if (amapResponse == null || amapResponse.getRegeocode() == null) {
             return null;
@@ -209,8 +215,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaMapper, Area> implements Ar
 
         // 优化查询，只取第一条记录
         LambdaQueryWrapper<Area> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Area::getName, addressComponent.getCity())
-                .last("LIMIT " + MAX_QUERY_RESULTS);
+        queryWrapper.eq(Area::getName, addressComponent.getCity()).last("LIMIT " + MAX_QUERY_RESULTS);
 
         Area area = this.getOne(queryWrapper);
         if (area == null) {

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

@@ -2,6 +2,7 @@ package com.ylx.massage.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,6 +19,7 @@ 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,7 @@ import java.util.stream.Collectors;
  * @since 2024-04-11 17:18:53
  */
 @Service("tAddressService")
+@Slf4j
 public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> implements TAddressService {
 
     //0=未删除
@@ -149,11 +152,12 @@ public class TAddressServiceImpl extends ServiceImpl<TAddressMapper, TAddress> i
          if (tAddress.getType() != 2) {
              throw new RuntimeException("地址类型错误，地址类型只能为2");
          }
-         if(StrUtil.isBlank(tAddress.getCityCode())){
+         if(StringUtils.isBlank(tAddress.getCityCode())){
              CoordinateDTO dto = new CoordinateDTO();
              dto.setLongitude(tAddress.getLongitude());
              dto.setLatitude(tAddress.getLatitude());
              CityInfoVo cityInfoVo = areaService.getCityInfoByCoordinates(dto);
+             log.info("根据经纬度获取城市信息：{}", JSON.toJSONString(cityInfoVo));
              tAddress.setCityCode(cityInfoVo.getCityCode());
          }
          if (StringUtils.isBlank(tAddress.getDetailAddress())){

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

@@ -614,7 +614,7 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
     }
 
     /**
-     * 查询我的动态列表（已发布的动态：审核中+审核通过）
+     * 查询我的动态列表（已发布的动态：审核中+审核通过+审核拒绝）
      *
      * @param openId   技师OpenID
      * @param pageNum  页码
@@ -629,18 +629,18 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
         }
 
         // 2. 根据openId查询技师信息
-        LambdaQueryWrapper<TJs> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TJs::getcOpenId, openId);
-        TJs technician = tJsMapper.selectOne(queryWrapper);
+        LambdaQueryWrapper<MaTechnician> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(MaTechnician::getCOpenid, openId);
+        MaTechnician technician = maTechnicianMapper.selectOne(queryWrapper);
         if (technician == null) {
-            throw new ServiceException("技师信息不存在");
+            throw new ServiceException("商户信息不存在");
         }
 
-        // 3. 查询该技师的已发布动态（待审核、审核通过）
+        // 3. 查询该商户的已发布动态（待审核、审核通过、审核拒绝）
         Page<TechnicianMoment> page = new Page<>(pageNum, pageSize);
         LambdaQueryWrapper<TechnicianMoment> momentWrapper = new LambdaQueryWrapper<>();
         momentWrapper.eq(TechnicianMoment::getTechnicianId, technician.getId())
-                .in(TechnicianMoment::getAuditStatus, 1, 2) // 1-待审核, 2-审核通过
+                .in(TechnicianMoment::getAuditStatus, 1, 2,3) // 1-待审核, 2-审核通过,3-审核拒绝
                 .orderByDesc(TechnicianMoment::getPublishTime);
 
         Page<TechnicianMoment> momentPage = momentMapper.selectPage(page, momentWrapper);
@@ -671,7 +671,6 @@ public class TechnicianMomentServiceImpl extends ServiceImpl<TechnicianMomentMap
         }).collect(Collectors.toList());
 
         voPage.setRecords(voList);
-        log.info("查询我的动态列表成功，技师ID：{}，页码：{}，每页数量：{}，总记录数：{}", technician.getId(), pageNum, pageSize, voPage.getTotal());
         return voPage;
     }