Merge remote-tracking branch 'origin/dev' into dev

nightFragrance-massage/src/main/java/com/ylx/massage/domain/vo/MerchantVo.java

@@ -50,4 +50,10 @@ public class MerchantVo implements Serializable {
     @ApiModelProperty("最低价格")
     private BigDecimal price;
 
+    /**
+     * 商户形象照
+     */
+    @ApiModelProperty("形象照，展示")
+    private String avatar;
+
 }

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

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AVG(mp.project_current_price) AS avgCurrentPrice,
             pro.highlight               AS highlight
         FROM project pro
-        INNER JOIN ma_project mp ON CAST(mp.project_id AS UNSIGNED) = pro.id AND mp.merchant_type = '0' AND mp.is_delete = 0 AND mp.project_is_enable = 1
+        INNER JOIN ma_project mp ON CAST(mp.project_id AS UNSIGNED) = pro.id AND mp.merchant_type = 1 AND mp.is_delete = 0 AND mp.project_is_enable = 1
         LEFT JOIN t_order o ON o.project_id = pro.id AND o.project_type = 1 AND o.status = 6 AND o.is_delete = 0
         WHERE pro.is_delete = 0
         AND EXISTS (
@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ) stat ON stat.merchant_id = t.id
         WHERE p.audit_status = 1
           AND p.is_delete = 0
-          AND p.merchant_type = 0
+          AND p.merchant_type = 1
           AND p.project_is_enable = 0
           AND t.audit_status = 2
           AND t.is_delete = 0

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

@@ -385,6 +385,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.n_star AS nStar,
             COALESCE(o.sales, 0) AS nNum,
             COALESCE(p.min_price, 0) AS price,
+            t.avatar AS avatar,
             -- 返回米（四舍五入保留0位小数，也可不ROUND）
             ROUND(ST_Distance_Sphere(POINT(a.longitude, a.latitude), POINT(#{dto.longitude}, #{dto.latitude})), 0) AS distance
         FROM ma_technician t
@@ -397,7 +398,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN (
             SELECT merchant_id, MIN(project_current_price) AS min_price
             FROM ma_project
-            WHERE is_delete = 0 AND audit_status = 1 AND merchant_type = '0' AND project_is_enable = 1
+            WHERE is_delete = 0 AND audit_status = 1 AND merchant_type = 1 AND project_is_enable = 1
             GROUP BY merchant_id
         ) p ON t.id = p.merchant_id
         LEFT JOIN (