Merge branch 'master-modify-cutAmount' into dev

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

@@ -266,10 +266,11 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
                 }
             }
         }
+        //getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) == 1--同一天；>1-- 延后；<1--提前；
         /**
          * 提前还车
          */
-        if (orderPageVO.getOrderRentVehicleDetail().getEndTime() > nowTime.getMillis()) {
+        if (getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) < 1) {
             StringBuilder stringBuilder = new StringBuilder();
             //提前的天数, 当天就算使用一天
             int noUsedDay = getDaysBetweenDateTimeHasStartEnd(nowTime, endTime) - 1;
@@ -295,7 +296,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
             /**
              * 延期还车
              */
-        } else if (orderPageVO.getOrderRentVehicleDetail().getEndTime() < nowTime.getMillis()) {
+        } else if (getDaysBetweenDateTimeHasStartEnd(endTime, nowTime) > 1) {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("违约金( ¥");
             //延期的天数, 延期违约金是延期天数*200%

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

@@ -27,7 +27,7 @@ public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "是否删除")
     private Integer isDel;
     @ApiModelProperty(value = "状态")
-    private Integer status=1;
+    private Integer status;
     @ApiModelProperty("分类逗号分割")
     String catasStr;
     @ApiModelProperty("排除的车型id")

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

@@ -49,8 +49,8 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
      * @return
      */
     public ObjectRestResponse findVehicleModelPage(VehicleModelQueryCondition vmqc) {
-        if (vmqc.getPathType()==1) {
-            vmqc.setStatus(null);
+        if (vmqc.getPathType()==2) {
+            vmqc.setStatus(1);
         }
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),