1
0

2 کامیت‌ها c10aac7c56 ... accccbe4b9

نویسنده SHA1 پیام تاریخ
  郭子栋 accccbe4b9 Merge remote-tracking branch 'origin/dev' into dev 6 روز پیش
  郭子栋 4c5c355d6b 首页商户按摩推荐增加根据项目id查询 6 روز پیش

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

@@ -45,5 +45,11 @@ public class MassageAllMerchantsDto {
     @ApiModelProperty("城市编码")
     private String cityCode;
 
+    /**
+     * 项目id
+     */
+    @ApiModelProperty("项目id")
+    private String projectId;
+
 
 }

+ 3 - 0
nightFragrance-massage/src/main/resources/mapper/massage/MaProjectMapper.xml

@@ -192,6 +192,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
           AND t.service_state = 1
           AND t.te_area_code = #{dto.cityCode}   -- 使用技师的区域编码过滤
           AND addr.merchant_id IS NOT NULL -- 必须有默认地址(用于距离计算)
+         <if test="dto.projectId != null and dto.projectId != ''">
+            AND p.project_id = #{dto.projectId}
+         </if>
         ORDER BY stat.order_count DESC
     </select>
 </mapper>