Merge branch 'dev-chw' of http://113.105.137.151:22280/youjj/cloud-platform into dev-chw

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

@@ -90,12 +90,14 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
      */
     public void addRent(@RequestBody SpecialRent specialRent, UserDTO userDTO) {
         AssertUtils.isBlank(userDTO);
+        AssertUtils.isBlank(specialRent.getUnitPrice());
         if(StrUtil.isBlank(specialRent.getVehicleId())) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
         }
 
         //Vehicle vehicle = vehicleFeign.get(specialRent.getVehicleId()).getData();
         VehicleVO vehicle = vehicleFeign.getVehicleDetail(specialRent.getVehicleId()).getData();
+        vehicle.setVehicleExtensions(vehicleFeign.vehicleEextensionTree(specialRent.getVehicleId()).getData());
 
         if(null == vehicle) {
             throw new BaseException(ResultCode.PARAM_ILLEGAL_CODE);
@@ -184,8 +186,8 @@ public class SpecialRentBiz extends BaseBiz<SpecialRentMapper, SpecialRent> {
         }
 
         Date endDateTime = DateUtil.date(specialRent.getEndTime());
-        Long delayTime = DateUtil.date().getTime() - DateUtil.offsetHour(endDateTime, -1).getTime();
-        specialRent.setOverTime(delayTime);
+        Long delayTime = DateUtil.offsetHour(endDateTime, -1).getTime() - DateUtil.date().getTime();
+        specialRent.setOverTime(DateUtil.offsetHour(endDateTime, -1).getTime());
         insertSelective(specialRent);
 //        rabbitProduct.sendApplyRequireDelayMessage(baseBiz.selectById(shuntApply.getId()), delayTime);
         rabbitProduct.sendSpecialDelayMessage(selectById(specialRent.getId()), delayTime);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -73,6 +73,10 @@ public interface VehicleFeign {
     @RequestMapping(value = "/app/vehicle/app/unauth/detail/{id}", method = RequestMethod.GET)
     public ObjectRestResponse<VehicleVO> getVehicleDetail(@PathVariable("id") String id);
 
+    //查询扩展信息
+    @RequestMapping(value = "/app/vehicleEextension/app/unauth/tree", method = RequestMethod.GET)
+    public ObjectRestResponse<List<VehicleExtensionVO>> vehicleEextensionTree(@RequestParam(value = "vehicleId")String vehicleId);
+
     //租车拒绝预约
     @RequestMapping(value = "/vehicleInfo/rent/book/reject/{bookRecordId}", method = RequestMethod.PUT)
     public RestResponse<Integer> rentRejectVehicleBooking(@PathVariable(value = "bookRecordId") Long bookRecordId);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/VehicleVO.java

@@ -69,7 +69,6 @@ public class VehicleVO extends Vehicle {
 
     private Map<String,Object> handleOption; // 可操作的选项
 
-
-
+    private List<VehicleExtensionVO> vehicleExtensions;
 
 }
\ No newline at end of file