用户订单列表修改

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

@@ -2,15 +2,12 @@ package com.xxfc.platform.order.pojo.order;
 
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.order.entity.*;
-import com.xxfc.platform.order.pojo.DetailsOfExpenses;
-import com.xxfc.platform.order.pojo.OrderAccompanyDTO;
 import com.xxfc.platform.order.pojo.price.RentVehiclePriceVO;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -23,6 +20,8 @@ public class OrderListVo extends BaseOrder {
 
     OrderMemberDetail orderMemberDetail;
 
+    OrderActiveDetail orderActiveDetail;
+
     List<VehicleUserLicense> vehicleUserLicenses;
 
     private String username;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderActivityController.java

@@ -44,6 +44,9 @@ public class OrderActivityController extends BaseController<OrderActivityDetailB
 		return baseBiz.getAll(dto);
 	}
 
+
+
+
 	@GetMapping(value = "/detail")
 	public ObjectRestResponse orderDetail(String no) {
 		return baseBiz.orderDetail(no, userFeign.userDetailByToken(request.getHeader("Authorization")).getData());

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

@@ -65,6 +65,12 @@
                              select="com.xxfc.platform.order.mapper.OrderMemberDetailMapper.selectByPrimaryKey"
                              javaType="com.xxfc.platform.order.entity.OrderMemberDetail"></association>
             </case>
+
+            <case value="4" resultType="com.xxfc.platform.order.pojo.order.OrderListVo">
+                <association column="detail_id" property="orderActiveDetail"
+                             select="com.xxfc.platform.order.mapper.OrderActiveDetailMapper.selectByPrimaryKey"
+                             javaType="com.xxfc.platform.order.entity.OrderActiveDetail"></association>
+            </case>
         </discriminator>
     </resultMap>