Merge branch 'master' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -156,4 +156,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "poster_background")
 	@ApiModelProperty(value = "海报背景")
 	private String posterBackground;
+
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
 }

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

@@ -168,6 +168,10 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
+	@Column(name = "sort")
+	@ApiModelProperty(value = "排序")
+	private Integer sort;
+
 
 //	@Column(name = "status")
 //	@ApiModelProperty(value = "状态 0--下架；1--上架")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -82,7 +82,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if(MileageLift==null||MileageLift1>=MileageLift){
+        if(MileageLift==null||MileageLift1 >= MileageLift){
             // 写入车辆公里数,预计目的地
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
@@ -233,6 +233,7 @@ public class VehicleActiveService {
             }
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
             DateTime actualArrivalDate = new DateTime(new Date());
+            //提前还车处理
             if(actualArrivalDate.compareTo(arrivalDate) < 0) { //实际还车时间小于预计还车时间，需要释放后面的时间
                 BookVehicleVO bookVehicleVo = new BookVehicleVO();
                 BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookHourInfoBiz.java

@@ -88,7 +88,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
             predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
             predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
         }
-        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000){ //
+        if(endDay.getMillis() - startDay.getMillis() > 24 * 3600 * 1000 ){ //
             for (DateTime curDate = startDay.plusDays(1); curDate.compareTo(endDay) < 0; curDate = curDate.plusDays(1)) {
                 String curDateStr = curDate.toString(DATE_TIME_FORMATTER);
                 //全天预定

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -70,6 +70,9 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     @Autowired
     private VehicleJobHandler vehicleJobHandler;
 
+    @Autowired
+    private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
+
     @Autowired
     BranchCompanyBiz branchCompanyBiz;
     @Autowired

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -28,11 +28,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -199,6 +200,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setCrtHost(host);
         vm.setIsdel(0);
         vm.setStatus(0);
+        vm.setSort(0);
         vm.setVioDeposit(BigDecimal.valueOf(500));
         try {
             //插入数据到车型并返回id
@@ -317,6 +319,18 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
     }
 
+    @ApiOperation("查询所有")
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse getList() {
+        Example exa = Example.builder(VehicleModel.class).where(
+                WeekendSqls.<VehicleModel>custom()
+                        .andEqualTo(VehicleModel::getIsdel, 0)
+        ).orderByAsc("sort").build();
+
+        return ObjectRestResponse.succ(baseBiz.selectByExample(exa));
+    }
+
     /**
      * 优质车型
      *
@@ -330,6 +344,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     public ObjectRestResponse<List<GoodDataVO>> goodList(@RequestParam(value = "page") Integer page, @RequestParam(value = "limit") Integer limit) {
         return ObjectRestResponse.succ(baseBiz.goodList(page, limit));
     }
+
     @ApiOperation("上下架")
     @PutMapping(value = "/setStatus/{id}/{status}")
     @Transactional