提交bookDetail接口，用于“客户端获取去预约项目详情”

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

@@ -8,6 +8,7 @@ import com.ylx.massage.domain.MaProject;
 import com.ylx.massage.domain.dto.MassageAllMerchantsDto;
 import com.ylx.massage.domain.vo.MassageAllMerchantsVo;
 import com.ylx.massage.domain.vo.MassageProjectRecommendVo;
+import com.ylx.project.domain.bookMerchant.vo.BookMerchantVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -69,10 +70,13 @@ public interface MaProjectMapper extends BaseMapper<MaProject> {
 
     /**
      * 首页项目推荐
+     *
      * @param page
      * @return
      */
-    Page<MassageProjectRecommendVo> getMassageProjectRecommend(@Param("page") Page<MassageProjectRecommendVo> page,@Param("cityCode") String cityCode);
+    Page<MassageProjectRecommendVo> getMassageProjectRecommend(@Param("page") Page<MassageProjectRecommendVo> page, @Param("cityCode") String cityCode);
+
+    Page<MassageAllMerchantsVo> getMassageAllMerchants(@Param("page") Page<MassageAllMerchantsVo> page, @Param("dto") MassageAllMerchantsDto dto);
 
-    Page<MassageAllMerchantsVo> getMassageAllMerchants(@Param("page") Page<MassageAllMerchantsVo> page,@Param("dto") MassageAllMerchantsDto dto);
+    Page<BookMerchantVO> selectMerchantList(@Param("page") Page<BookMerchantVO> page, @Param("projectId") Long projectId);
 }

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

@@ -11,6 +11,7 @@ import com.ylx.massage.domain.vo.MaProjectListVo;
 import com.ylx.massage.domain.vo.MaProjectSaveVo;
 import com.ylx.massage.domain.vo.MassageAllMerchantsVo;
 import com.ylx.massage.domain.vo.MassageProjectRecommendVo;
+import com.ylx.project.domain.bookMerchant.vo.BookMerchantVO;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -72,4 +73,6 @@ public interface IMaProjectService extends IService<MaProject>
     Page<MassageProjectRecommendVo> getMassageProjectRecommend(Page<MassageProjectRecommendVo> page,String cityCode);
 
     Page<MassageAllMerchantsVo> getMassageAllMerchants(Page<MassageAllMerchantsVo> page, MassageAllMerchantsDto dto);
+
+    Page<BookMerchantVO> selectMerchantList(Page<BookMerchantVO> page, Long projectId);
 }

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

@@ -14,6 +14,7 @@ import com.ylx.massage.domain.vo.MaProjectSaveVo;
 import com.ylx.massage.domain.vo.MassageAllMerchantsVo;
 import com.ylx.massage.domain.vo.MassageProjectRecommendVo;
 import com.ylx.massage.mapper.MaProjectMapper;
+import com.ylx.project.domain.bookMerchant.vo.BookMerchantVO;
 import org.apache.commons.compress.utils.Lists;
 import org.springframework.stereotype.Service;
 import com.ylx.massage.domain.MaProject;
@@ -143,4 +144,9 @@ public class MaProjectServiceImpl extends ServiceImpl<MaProjectMapper, MaProject
         return maProjectMapper.getMassageAllMerchants(page, dto);
     }
 
+    @Override
+    public Page<BookMerchantVO> selectMerchantList(Page<BookMerchantVO> page, Long projectId) {
+        return maProjectMapper.selectMerchantList(page, projectId);
+    }
+
 }

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

@@ -103,7 +103,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         // 根据项目亮点ID集合获取项目亮点
         String highlightNames = this.buildHighlightNames(dto.getHighlightIds());
-        if(StrUtil.isNotEmpty(highlightNames)){
+        if (StrUtil.isNotEmpty(highlightNames)) {
             entity.setHighlight(highlightNames);
         }
 
@@ -131,7 +131,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
 
         // 根据项目亮点ID集合获取项目亮点
         String highlightNames = this.buildHighlightNames(dto.getHighlightIds());
-        if(StrUtil.isNotEmpty(highlightNames)){
+        if (StrUtil.isNotEmpty(highlightNames)) {
             entity.setHighlight(highlightNames);
         }
 
@@ -212,10 +212,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         vo.setProjectInfo(projectInfo);
 
         // 2. 查询商户列表
-//        Page<BookMerchantVO> merchantList = maProjectService.selectMerchantList(dto);
+        Page<BookMerchantVO> page = new Page<>(dto.getCurrent(), dto.getSize());
+        Page<BookMerchantVO> merchantList = maProjectService.selectMerchantList(page, projectId);
 
 
-//        vo.setMerchantList(merchantList);
+        vo.setMerchantList(merchantList);
         return vo;
     }
 

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

@@ -197,4 +197,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </if>
         ORDER BY stat.order_count DESC
     </select>
+    <select id="selectMerchantList" resultType="com.ylx.project.domain.bookMerchant.vo.BookMerchantVO">
+        SELECT
+            mp.id,
+            mp.merchant_id AS merchantId,
+            m.te_nick_name AS merchantNickName,
+            m.te_avatar AS merchantAvatar,
+            m.n_star AS merchantStar,
+            mp.project_current_price AS currentPrice,
+            mp.project_users_num AS servedCount
+        FROM ma_project mp
+        LEFT JOIN ma_technician m ON mp.merchant_id = m.id
+        WHERE mp.project_id = #{projectId}
+          AND mp.audit_status = 1      -- 仅展示审核通过的
+          AND mp.project_is_enable = 0 -- 未申请下架
+          AND mp.is_delete = 0
+        ORDER BY mp.project_users_num DESC -- 按真实销量降序排列
+    </select>
 </mapper>