用户端热门推荐代码提交

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/MaTechnicianMapper.java

@@ -233,7 +233,7 @@ public interface MaTechnicianMapper extends BaseMapper<MaTechnician> {
 
     List<MerchantWithAddressVO> selectTechWithAddressByIds(@Param("ids") List<Integer> ids);
 
-    List<MerchantWithAddressVO> listValidTechWithAddress(@Param("offset") long offset, @Param("fetchCount") long fetchCount);
+    List<MerchantWithAddressVO> listValidTechWithAddress(@Param("offset") long offset, @Param("size") long fetchCount);
 
     /**
      * 查询全部有效技师（未删除、正常、审核通过、非休息）

nightFragrance-massage/src/main/java/com/ylx/project/mapper/ProjectMapper.java

@@ -28,7 +28,7 @@ public interface ProjectMapper extends BaseMapper<Project> {
         return deleteById(id);
     }
 
-    List<Project> selectProjectPage(@Param("offset") long offset, @Param("fetchCount") long fetchCount);
+    List<Project> selectProjectPage(@Param("offset") long offset, @Param("size") long fetchCount);
 
     Long countValidProject();
 

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

@@ -590,14 +590,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
         FROM ma_technician t
         <!-- 关联项目表以获取价格和分类信息 -->
-        LEFT JOIN ma_project p ON t.id = p.merchant_id AND p.audit_status = 1 AND p.is_delete = 0 AND p.project_is_enable = 0
+        LEFT JOIN ma_project p ON t.id = p.merchant_id AND p.audit_status = 1 AND p.is_delete = 0 AND p.project_is_enable = 1
         LEFT JOIN t_address ta ON t.id = ta.merchant_id AND ta.user_type = 2 AND ta.is_default = 1 AND ta.is_delete = 0
         LEFT JOIN project proj ON p.project_id = proj.id AND proj.is_delete = 0 AND proj.status = 0
         LEFT JOIN service_category sc ON proj.category_id = sc.id AND sc.is_delete = 0 AND sc.is_online = 1
 
         <where>
             <!-- 基础状态过滤 -->
-            AND t.audit_status = 1
+            AND t.audit_status = 2
             AND t.merchant_status = 0
             AND t.is_delete = 0