新增押金记录，修改租车核销

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

@@ -174,10 +174,13 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             if (vehicle == null) {
                 return ObjectRestResponse.createFailedResult(500, "订单车辆不存在！");
             }
-            //判断车辆公里数
-            if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {
-                return ObjectRestResponse.createFailedResult(500, "请输入车辆仪表盘实际公里数！");
-            }
+                if( vehicle.getMileageLastUpdate() != null) {
+                    //判断车辆公里数
+                    if (orderVehicleCrosstownDto.getMileage() == null || orderVehicleCrosstownDto.getMileage() < vehicle.getMileageLastUpdate()) {
+                        return ObjectRestResponse.createFailedResult(500, "请输入车辆仪表盘实际公里数！");
+                    }
+                }
+
         }
 
         //调用车辆管理的出车还车

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

@@ -15,7 +15,6 @@ import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
-import com.xxfc.platform.order.entity.OrderUserLicense;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import com.xxfc.platform.order.pojo.order.OrderVehicleCrosstownDto;
@@ -23,8 +22,10 @@ import com.xxfc.platform.order.pojo.order.QueryOrderDTO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.QueryMultiDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Data;
@@ -109,16 +110,23 @@ public class BackStageOrderController extends CommonBaseController implements Us
                         orderPageVO.setVehicleNumberPlat(restResponse.getData().getNumberPlate());
                     }
                     if (StringUtils.isNotBlank(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds())) {
-                        List<OrderUserLicense> orderUserLicenses = orderUserLicenseBiz.selectByIds(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds()).getData();
-
-                        if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
-                            OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
-                            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);
-                        }
+                       try {
+                           QueryMultiDTO queryMultiDTO = new QueryMultiDTO();
+                           queryMultiDTO.setIds(orderPageVO.getOrderRentVehicleDetail().getMyDriverIds());
+                           List<VehicleUserLicense> orderUserLicenses = vehicleFeign.multi(queryMultiDTO).getData();
+
+                           if (orderUserLicenses != null && orderUserLicenses.size() > 0) {
+                               OrderVehicleCrosstownDto orderVehicleCrosstownDto = new OrderVehicleCrosstownDto();
+                               orderVehicleCrosstownDto.setLicenseIdCard(orderUserLicenses.get(0).getIdCard());
+                               orderVehicleCrosstownDto.setLicenseImg(orderUserLicenses.get(0).getImg());
+                               orderVehicleCrosstownDto.setLicenseName(orderUserLicenses.get(0).getName());
+                               orderVehicleCrosstownDto.setLicensePhone(orderUserLicenses.get(0).getPhone());
+                               orderPageVO.setOrderVehicleCrosstownDto(orderVehicleCrosstownDto);
+                           }
+                       } catch (Exception e) {
+                           log.info("获取驾驶人信息失败！");
+                       }
+
                     }
 
                 }

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

@@ -11,6 +11,5 @@
             parameterType="java.lang.Integer">
      select * from deposit_refund_record
      where crosstown_id = #{crossId} and isshow = 1
-     order by status
   </select>
 </mapper>
\ No newline at end of file