Merge branch 'master-bg-update' into base-modify

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

@@ -37,4 +37,6 @@ public class BgOrderListVo {
 	private Integer payWay;
 	//订单详情ID
 	private Integer detailId;
+	//车辆编号
+	private Integer vehicleCode;
 }

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

@@ -229,6 +229,73 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
         return ObjectRestResponse.succ(orderPageVo);
     }
 
+
+
+	public ObjectRestResponse<OrderPageVO> orderDetail(String no, UserDTO userDTO) {
+		OrderPageVO orderPageVo = mapper.getOrderDetail(no);
+		if (orderPageVo == null) {
+			return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
+		}
+		AppUserDTO appUserVo = userFeign.userDetailById(orderPageVo.getUserId()).getData();
+		if(appUserVo != null) {
+			orderPageVo.setTelephone(appUserVo.getUsername());
+			orderPageVo.setUsername(appUserVo.getRealname());
+		}
+		List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+		List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+
+		if (orderPageVo.getOrderRentVehicleDetail() != null) {
+
+			if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+				return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
+			}
+			if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
+				orderPageVo.setUserCompanyStatus(true);
+			}
+			if (orderPageVo.getStatus() == 4) { //未交车
+//                boolean flag = getTodayTime(orderPageVo.getOrderRentVehicleDetail().getStartTime());
+//                if (!flag) {
+//                    return ObjectRestResponse.createFailedResult(3501, "今日不是交车日期");
+//                }
+				getDriverInfo(orderPageVo);
+			} else if (orderPageVo.getStatus() >= 5 || orderPageVo.getStatus() == -1) {//出行中 已交车
+				//设置违约金金额
+				getDriverInfo(orderPageVo);
+				getUserLicense(orderPageVo);
+			}
+			ObjectRestResponse<CompanyDetail> startResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId());
+			if (startResponse.getData() != null) {
+				orderPageVo.setStartCompanyName(startResponse.getData().getName());
+			}
+
+			ObjectRestResponse<CompanyDetail> restResponse = vehicleFeign.getCompanyDetail(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId());
+			if (restResponse.getData() != null) {
+				orderPageVo.setEndCompanyName(restResponse.getData().getName());
+			}
+			RestResponse<Vehicle> response = vehicleFeign.findById(orderPageVo.getOrderRentVehicleDetail().getVehicleId());
+			if (response.getData() != null) {
+				orderPageVo.setVehicalNumberPlat(response.getData().getNumberPlate());
+				orderPageVo.setCode(response.getData().getCode());
+			}
+
+		} else if (orderPageVo.getOrderTourDetail() != null) {
+			if(StringUtils.isNotBlank(orderPageVo.getOrderTourDetail().getTourUserIds())) {
+				List<TourUser> list = tourFeign.getTourUsers(orderPageVo.getOrderTourDetail().getTourUserIds()).getData();
+				orderPageVo.getOrderTourDetail().setUserVoList(list == null || list.size() <= 0 ? new ArrayList<>() : list);
+			}
+		}
+
+		//设置保留金
+		Map<String, Dictionary> dictionaryMap = thirdFeign.dictionaryGetAll4Map().getData();
+		BigDecimal illegalReserve = new BigDecimal(dictionaryMap.get(APP_ORDER + "_" + DictionaryKey.ILLEGAL_RESERVE).getDetail());
+		orderPageVo.setIllegalReserve(illegalReserve);
+		orderPageVo.setItems(orderItemBiz.selectList(new OrderItem(){{
+			setOrderId(orderPageVo.getId());
+		}}));
+		return ObjectRestResponse.succ(orderPageVo);
+	}
+
+
     //获取两个日期之间的天数（不包含头尾）
     public int getDaysBetweenDateTime(DateTime startDay, DateTime endDay) {
         int a = 0;

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

@@ -361,7 +361,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
     @ApiOperation(value = "交还车获取订单详情，带驾驶人信息")
     @IgnoreClientToken
     @ResponseBody
-    public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo) {
+    public ObjectRestResponse<OrderPageVO> getOrderDetail(String orderNo, Boolean flag) {
         UserDTO userDTO = getAdminUserInfo();
         if (userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
@@ -369,7 +369,11 @@ public class BackStageOrderController extends CommonBaseController implements Us
         if (StringUtils.isBlank(orderNo)) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+        if(flag != null && flag == true) {
+            return baseOrderBiz.orderDetail(orderNo, userDTO);
+        } else {
+            return baseOrderBiz.getOrderDetail(orderNo, userDTO);
+        }
     }
 
 

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

@@ -245,6 +245,7 @@
         bc1.`name` AS startCompanyName,
         bc2. NAME AS endCompanyName,
         v1.number_plate AS numberPlate,
+        v1.code AS vehicleCode,
         a1. NAME AS username,
         a2.username AS telephone,
         b1.id AS orderId,
@@ -256,7 +257,8 @@
         o1.end_time as endTime,
         b1.real_amount as realAmount,
         b1.pay_way as payWay,
-        o1.id as detailId
+        o1.id as detailId,
+        b1.pay_time as payTime
         FROM
         base_order b1
         LEFT JOIN order_rent_vehicle_detail o1 ON b1.detail_id = o1.id