首页按摩项目推荐接口调整

nightFragrance-massage/src/main/java/com/ylx/massage/controller/MassageRecommendController.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ylx.common.core.domain.R;
 import com.ylx.massage.domain.dto.MassageAllMerchantsDto;
 import com.ylx.massage.domain.dto.MassageMerchantRecommendDto;
+import com.ylx.massage.domain.dto.MassageProjectRecommendDTO;
 import com.ylx.massage.domain.vo.MassageAllMerchantsVo;
 import com.ylx.massage.domain.vo.MassageProjectRecommendVo;
 import com.ylx.massage.domain.vo.MerchantVo;
@@ -33,25 +34,25 @@ public class MassageRecommendController {
     @Autowired
     private IMassageRecommendService massageRecommendService;
 
-    @ApiOperation(value="首页按摩商户推荐", notes="首页按摩商户推荐")
+    @ApiOperation(value = "首页按摩商户推荐", notes = "首页按摩商户推荐")
     @PostMapping(value = "/getMerchantRecommend")
     public R<List<MerchantVo>> getMerchantRecommend(@RequestBody MassageMerchantRecommendDto dto) {
         List<MerchantVo> massageRecommendVos = massageRecommendService.getMerchantRecommend(dto);
         return R.ok(massageRecommendVos);
     }
 
-    @ApiOperation(value="首页按摩项目推荐", notes="首页按摩项目推荐")
-    @GetMapping(value = "/getMassageProjectRecommend")
-    public R<Page<MassageProjectRecommendVo>> getMassageProjectRecommend(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize,@RequestParam("cityCode") String cityCode) {
-        Page<MassageProjectRecommendVo> page = new Page<>(pageNo, pageSize);
-        return R.ok( massageRecommendService.getMassageProjectRecommend(page,cityCode));
+    @ApiOperation(value = "首页按摩项目推荐", notes = "首页按摩项目推荐")
+    @PostMapping(value = "/getMassageProjectRecommend")
+    public R<Page<MassageProjectRecommendVo>> getMassageProjectRecommend(@Validated @RequestBody MassageProjectRecommendDTO dto) {
+        Page<MassageProjectRecommendVo> page = new Page<>(dto.getCurrent(), dto.getSize());
+        return R.ok(massageRecommendService.getMassageProjectRecommend(page, dto.getCityCode()));
     }
 
-    @ApiOperation(value="首页按摩推荐商户点击全部查询按摩所有商户", notes="首页按摩推荐商户点击全部查询按摩所有商户")
+    @ApiOperation(value = "首页按摩推荐商户点击全部查询按摩所有商户", notes = "首页按摩推荐商户点击全部查询按摩所有商户")
     @PostMapping(value = "/getMassageAllMerchants")
     public R<Page<MassageAllMerchantsVo>> getMassageAllMerchants(@Validated @RequestBody MassageAllMerchantsDto dto) {
-        Page<MassageAllMerchantsVo> page = new Page<>(dto.getPageNo(), dto.getPageSize());
-        return R.ok( massageRecommendService.getMassageAllMerchants(page,dto));
+        Page<MassageAllMerchantsVo> page = new Page<>(dto.getCurrent(), dto.getSize());
+        return R.ok(massageRecommendService.getMassageAllMerchants(page, dto));
     }
 
 

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

@@ -1,10 +1,13 @@
 package com.ylx.massage.domain.dto;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.massage.domain.vo.MassageAllMerchantsVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
@@ -14,16 +17,11 @@ import java.math.BigDecimal;
  * @version 1.0
  * @date 2026/6/4 9:31
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
-public class MassageAllMerchantsDto {
+public class MassageAllMerchantsDto extends Page<MassageAllMerchantsVo> implements Serializable {
+    private static final long serialVersionUID = -2201674487204015309L;
 
-    @NotNull(message = "页码不能为空")
-    @ApiModelProperty("页码")
-    private Integer pageNo;
-
-    @NotNull(message = "每页大小不能为空")
-    @ApiModelProperty("每页大小")
-    private Integer pageSize;
     /**
      * 经度
      * 用户当前位置的经度坐标
@@ -51,5 +49,4 @@ public class MassageAllMerchantsDto {
     @ApiModelProperty("项目id")
     private String projectId;
 
-
 }

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

@@ -0,0 +1,23 @@
+package com.ylx.massage.domain.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ylx.massage.domain.vo.MassageProjectRecommendVo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@ApiModel("按摩项目推荐DTO")
+public class MassageProjectRecommendDTO extends Page<MassageProjectRecommendVo> implements Serializable {
+    private static final long serialVersionUID = 4958777236645803139L;
+
+    @NotBlank(message = "城市编码不能为空")
+    @ApiModelProperty("城市编码")
+    private String cityCode;
+
+}

nightFragrance-massage/src/main/resources/mapper/massage/MaProjectMapper.xml

@@ -319,7 +319,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                     AND tech.is_delete = 0
                                     AND tech.audit_status = 2
                                     AND tech.service_state = 1
-            WHERE mp.merchant_type = 1
+            WHERE mp.service_tag = 1
               AND mp.is_delete = 0
               AND mp.project_is_enable = 1
             GROUP BY CAST(mp.project_id AS UNSIGNED)
@@ -369,7 +369,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON p.merchant_id = CAST(t.id AS CHAR)
         AND p.audit_status = 1
         AND p.is_delete = 0
-        AND p.merchant_type = 1
+        AND p.service_tag = 1
         AND p.project_is_enable = 0
         <if test="dto.projectId != null and dto.projectId != ''">
             AND p.project_id = #{dto.projectId}
@@ -477,7 +477,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                                     AND tech.is_delete = 0
                                     AND tech.audit_status = 2
                                     AND tech.service_state = 1
-            WHERE mp.merchant_type = 2
+            WHERE mp.service_tag = 2
               AND mp.is_delete = 0
               AND mp.project_is_enable = 1
             GROUP BY CAST(mp.project_id AS UNSIGNED)
@@ -531,7 +531,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ON p.merchant_id = CAST(t.id AS CHAR)
         AND p.audit_status = 1
         AND p.is_delete = 0
-        AND p.merchant_type = 2
+        AND p.service_tag = 2
         AND p.project_is_enable = 0
         <if test="dto.projectId != null and dto.projectId != ''">
             AND p.project_id = #{dto.projectId}