修改订单

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.java

 package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.entity.OrderRentVehicleDetail;
+import com.xxfc.platform.order.entity.OrderTourDetail;
 import lombok.Data;
 
 import java.util.Map;
 
 @Data
 public class OrderPageVO extends BaseOrder {
-    Map detail;
+    OrderRentVehicleDetail orderRentVehicleDetail;
+    OrderTourDetail orderTourDetail;
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -29,10 +29,10 @@
         <result javaType="Integer" column="type" property="type"></result>
         <discriminator javaType="Integer" column="type">
             <case value="1" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
-                <association column="id" property="detail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.oneByOrderId"></association>
+                <association column="detail_id" property="orderRentVehicleDetail" select="com.xxfc.platform.order.mapper.OrderRentVehicleDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderRentVehicleDetail"></association>
             </case>
             <case value="2" resultType="com.xxfc.platform.order.pojo.order.OrderPageVO">
-                <association column="id" property="detail" select="com.xxfc.platform.order.mapper.OrderTourDetailMapper.oneByOrderId"></association>
+                <association column="detail_id" property="orderTourDetail" select="com.xxfc.platform.order.mapper.OrderTourDetailMapper.selectByPrimaryKey" javaType="com.xxfc.platform.order.entity.OrderTourDetail"></association>
             </case>
         </discriminator>
     </resultMap>

xx-order/xx-order-server/src/main/resources/mapper/OrderTourDetailMapper.xml

@@ -19,7 +19,7 @@
         <result property="endCity" column="end_city"/>
         <result property="startCityName" column="start_city_name"/>
         <result property="endCityName" column="end_city_name"/>
-        <result property="myPassagerIds" column="my_passager_ids"/>
+        <result property="myUserIds" column="my_user_ids"/>
         <result property="startCompanyId" column="start_company_id"/>
         <result property="costDetail" column="cost_detail"/>
     </resultMap>

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourDepartTimeVo.java

@@ -60,6 +60,4 @@ public class TourDepartTimeVo {
 	@ApiModelProperty(value = "是否过期")
 	private Integer overdue;
 
-	
-
 }