修改交还车接口

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

@@ -115,23 +115,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
             return ObjectRestResponse.createDefaultFail();
         }
 
-       if(orderPageVo.getStatus() >= 5) {//出行中 已交车
-           OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
-           orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
-           orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
-           List<OrderVehicaleCrosstown> orderVehicaleCrosstowns = orderVehicalCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-          if(orderVehicaleCrosstowns != null && orderVehicaleCrosstowns.size() > 0) {
-              List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicaleCrosstowns.get(0).getUserLicenseId()).getData();
-              if(orderUserLicenses != null && orderUserLicenses.size() > 0) {
-                  orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
-                  orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
-                  orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
-                  orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
-              }
-
-          }
-           orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
-       } else { //未交车
+        if(orderPageVo.getStatus() == 4) { //未交车
            List<VehicleUserLicense> vehicleUserLicenses = Lists.newArrayList();
            String myDriverIds = orderPageVo.getOrderRentVehicleDetail().getMyDriverIds();
            if(StringUtils.isNotBlank(myDriverIds)) {
@@ -149,14 +133,30 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper,BaseOrder> {
                    }
                } else {
                    try {
-                       vehicleUserLicenses.add(vehicleFeign.one(Integer.parseInt(myDriverIds)).getData());
+                       vehicleUserLicenses.add(vehicleFeign.getOne(Integer.parseInt(myDriverIds.trim())).getData());
                    }catch (Exception e){
                        e.printStackTrace();
                    }
                }
            }
            orderPageVo.setVehicleUserLicenses(vehicleUserLicenses);
-       }
+       } else if(orderPageVo.getStatus() >= 5) {//出行中 已交车
+            OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+            orderVehicleCrosstownDto.setOrderId(orderPageVo.getId());
+            orderVehicleCrosstownDto.setOrderNo(orderPageVo.getNo());
+            List<OrderVehicaleCrosstown> orderVehicaleCrosstowns = orderVehicalCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+            if(orderVehicaleCrosstowns != null && orderVehicaleCrosstowns.size() > 0) {
+                List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderVehicaleCrosstowns.get(0).getUserLicenseId()).getData();
+                if(orderUserLicenses != null && orderUserLicenses.size() > 0) {
+                    orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getLicenseIdCard());
+                    orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getLicenseImg());
+                    orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getLicenseName());
+                    orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getLicensePhone());
+                }
+
+            }
+            orderPageVo.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+        }
 
         return ObjectRestResponse.succ(orderPageVo);
     }

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

@@ -156,7 +156,7 @@ public class BaseOrderController extends CommonBaseController {
     public ObjectRestResponse<List<OrderPageVO>> getTourList(QueryOrderList dto) {
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
-                dto.setEndTime(new Date().getTime());
+                dto.setEndTime(dto.getStartTime());
             }
 
         }