出车bug

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

+package com.xxfc.platform.order.pojo.bg;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class BgOrderListVo {
+	//订单号
+	private Integer orderId;
+	//用户名
+	private String username;
+	//手机号
+	private String telephone;
+	//车牌号
+	private String numberPlate;
+	//车辆名称
+	private String vehicleName;
+	//订单号
+	private String orderNo;
+	//订单状态
+	private Integer status;
+	//下单时间
+	private Date crtTime;
+	//交车时间
+	private Long startTime;
+	//还车时间
+	private Long endTime;
+	//交车公司
+	private String startCompanyName;
+	//还车公司
+	private String endCompanyName;
+	//订单金额
+	private BigDecimal realAmount;
+	//支付方式
+	private Integer payWay;
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BackgroundBaseOrderBiz.java

@@ -9,15 +9,11 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.mapper.BaseOrderMapper;
-import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.rest.BaseOrderController;
-import com.xxfc.platform.tour.entity.TourUser;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -78,24 +74,6 @@ public class BackgroundBaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder>
 		}
 		Query query = new Query(dto);
 		PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllOrderList(query.getSuper()));
-		List<OrderListVo> list = pageDataVO.getData();
-
-		if(list != null && list.size() > 0 && dto.getType() == 2) {
-			for (OrderListVo orderPageVO : list) {
-				if (dto.getType() == 2) {
-					if (orderPageVO.getOrderTourDetail() != null && orderPageVO.getOrderTourDetail().getStartCompanyId() != null) {
-						ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVO.getOrderTourDetail().getStartCompanyId());
-						if (startResponse.getData() != null) {
-							orderPageVO.setStartCompanyName(startResponse.getData().getName());
-						}
-						if (StringUtils.isNotBlank(orderPageVO.getOrderTourDetail().getTourUserIds())) {
-							List<TourUser> tourUsers = tourFeign.getTourUsers(orderPageVO.getOrderTourDetail().getTourUserIds()).getData();
-							orderPageVO.getOrderTourDetail().setUserVoList(tourUsers == null || tourUsers.size() <= 0 ? new ArrayList<>() : tourUsers);
-						}
-					}
-				}
-			}
-		}
 		return ObjectRestResponse.succ(pageDataVO);
 	}
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

 package com.xxfc.platform.order.mapper;
 
 import com.xxfc.platform.order.entity.BaseOrder;
+import com.xxfc.platform.order.pojo.bg.BgOrderListVo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderBo;
 import com.xxfc.platform.order.pojo.dto.MemberOrderFindDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
@@ -35,7 +36,7 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 
 	List<MemberOrderBo> findMemberOrders(MemberOrderFindDTO memberOrderFindDTO);
 
-	public List<OrderListVo> getAllOrderList(Map<String, Object> paramMap);
+	public List<BgOrderListVo> getAllOrderList(Map<String, Object> paramMap);
 
 
 }

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

@@ -237,19 +237,30 @@
         </if>
 
     </select>
-    <select id="getAllOrderList" parameterType="Map" resultMap="orderPageMap">
-        SELECT bc1.`name` as startCompanyName, bc2.name as endCompanyName, v1.number_plate as vehicleNumberPlat, a1.name as realName,a2.username as telephone, b1.* from base_order b1
-        LEFT JOIN order_rent_vehicle_detail o1 on b1.detail_id = o1.id
-        <!--开始公司-->
-        LEFT JOIN xxfc_vehicle.branch_company bc1 on bc1.id = o1.start_company_id
-        <!--结束公司-->
+    <select id="getAllOrderList" parameterType="Map" resultType="com.xxfc.platform.order.pojo.bg.BgOrderListVo">
+        SELECT
+        bc1.`name` AS startCompanyName,
+        bc2. NAME AS endCompanyName,
+        v1.number_plate AS numberPlate,
+        a1. NAME AS username,
+        a2.username AS telephone,
+        b1.id AS orderId,
+        b1.`no` AS orderNo,
+        b1.`status` as status,
+        b1.`name` as vehicleName,
+        b1.crt_time as crtTime,
+        o1.start_time as startTime,
+        o1.end_time as endTime,
+        b1.real_amount as realAmount,
+        b1.pay_way as payWay
+        FROM
+        base_order b1
+        LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id
+        LEFT JOIN xxfc_vehicle.branch_company bc1 ON bc1.id = o1.start_company_id
         LEFT JOIN xxfc_vehicle.branch_company bc2 ON bc2.id = o1.end_company_id
-        <!--车辆信息-->
-        LEFT JOIN xxfc_vehicle.vehicle v1 on v1.id = o1.vehicle_id
-        <!--获取用户真实姓名-->
-        LEFT JOIN xxfc_third_platform.id_information a1 on b1.user_id = a1.user_login_id
-        <!--获取用户手机号-->
-        LEFT JOIN ag_admin_v2.app_user_login a2 on a2.id = b1.user_id
+        LEFT JOIN xxfc_vehicle.vehicle v1 ON v1.id = o1.vehicle_id
+        LEFT JOIN xxfc_third_platform.id_information a1 ON b1.user_id = a1.user_login_id
+        LEFT JOIN ag_admin_v2.app_user_login a2 ON a2.id = b1.user_id
         <where>
             <if test="userIds != null and userIds.size() > 0">
                 and b1.user_id in