商户订单列表和详情添加字段projectType;

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/MerchantOrderDetailVO.java

@@ -104,4 +104,7 @@ public class MerchantOrderDetailVO<T> implements IAfterSaleDisplay, IGeoRiskInfo
     @ApiModelProperty("履约状态：0=待出发/待签到，1=已出发，2=已到达/已签到")
     private Integer execStatus;
 
+    @ApiModelProperty("项目服务标签: 1=按摩 2=陪玩")
+    private Integer projectType;
+
 }

nightFragrance-massage/src/main/java/com/ylx/order/domain/vo/merchant/OrderPageVO.java

@@ -35,7 +35,10 @@ public class OrderPageVO<T> implements IAfterSaleDisplay, IGeoRiskInfo {
     @ApiModelProperty("项目封面图")
     private String projectCover;
 
-    @ApiModelProperty("")
+    @ApiModelProperty("项目服务标签: 1=按摩 2=陪玩")
+    private Integer projectType;
+
+    @ApiModelProperty("项目时长")
     private Integer projectDuration;
 
     @ApiModelProperty("项目标价/售价")

nightFragrance-massage/src/main/resources/mapper/order/TOrderMapper.xml

@@ -22,6 +22,7 @@
         <result column="status" property="status"/>
         <result column="distance_km" property="distanceKm"/>
         <result column="create_time" property="createTime"/>
+        <result column="project_type" property="projectType"/>
     </resultMap>
 
     <select id="selectValidOrdersByMerchantAndDate" resultType="com.ylx.order.domain.TOrder">
@@ -64,7 +65,8 @@
                 WHEN o.user_longitude = 0 OR o.user_latitude = 0 THEN NULL
                 ELSE ROUND(ST_Distance_Sphere(POINT(o.user_longitude, o.user_latitude), POINT(#{dto.longitude}, #{dto.latitude})) / 1000, 2)
             END AS distance_km,
-            o.create_time
+            o.create_time,
+            o.project_type
         FROM t_order o
         LEFT JOIN project p ON o.project_id = p.id
         <where>