Merge branch 'dev-chw-vehicle' into dev-chw

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

@@ -281,19 +281,15 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 		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()) {
+			if (orderPageVo.getStatus() == 4) { //未交车
+				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId())) {
 					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) {//出行中 已交车
+				if (userDTO.getCompanyId().equals(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
+					orderPageVo.setUserCompanyStatus(true);
+				}
 				//设置违约金金额
 				getDriverInfo(orderPageVo);
 				getUserLicense(orderPageVo);