Merge branch 'master-modify-cutAmount' into dev

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

@@ -157,7 +157,7 @@ public class OrderCalculateBiz {
             setOrderId(baseOrder.getId());
         }});
         Integer freeDays = (null == orderItem.getCutNum())?0 :orderItem.getCutNum();
-        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, null);
+        return inProgressCalculate(baseOrder, orderItem, freeDays, useDays, new OrderAccountDetail());
     }
 
     public InProgressVO calculateOrderComplete(BaseOrder baseOrder, OrderRentVehicleDetail orvd, OrderAccountDetail oad, OrderItem orderItem, Integer useDays) {

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

@@ -164,21 +164,21 @@ public class VehicleActiveService {
         }
         List<VehicleBookRecordVo> vehicleBookRecordVos = vehicleBookRecordBiz.selectByVehicleId(vehicleId);
         if (vehicleBookRecordVos != null && vehicleBookRecordVos.size() > 0) {
-        Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
-        while (iterator.hasNext()) {
-            VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-            if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
-                stringBuilder.append("中，使用人：");
-                stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
-                stringBuilder.append(" 使用人电话：");
-                stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
-                return stringBuilder.toString();
+            Iterator<VehicleBookRecordVo> iterator = vehicleBookRecordVos.iterator();
+            while (iterator.hasNext()) {
+                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() != 1) { //已经出车
+                    stringBuilder.append("中，使用人：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUsername());
+                    stringBuilder.append(" 使用人电话：");
+                    stringBuilder.append(vehicleBookRecordVo.getVehicleUserPhone());
+                    return stringBuilder.toString();
+                }
             }
         }
-    }
         stringBuilder.append(", 请联系管理员修改车辆状态为正常状态");
         return stringBuilder.toString();
-}
+    }
 
     public void arrival(VehicleArrivalVo arrivalVo) {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(arrivalVo.getVehicleId());
@@ -214,9 +214,6 @@ public class VehicleActiveService {
             }
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-
             // 出车记录
             VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
 
@@ -229,12 +226,12 @@ public class VehicleActiveService {
             boolean flag = true;
             VehicleDepartureLog departureLog = departureLogVo.getVehicleDeparture(departureLogVo);
             List<VehicleDepartureLog> list = vehicleDepartureLogMapper.selectByVehicle(arrivalVo.getVehicleId());
-            for(VehicleDepartureLog vehicleDepartureLogVo : list) {
-                if(vehicleDepartureLogVo.getState() != 1 && vehicleDepartureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
+            for (VehicleDepartureLog vehicleDepartureLogVo : list) {
+                if (vehicleDepartureLogVo.getState() != 1 && vehicleDepartureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
                     flag = false;
                 }
             }
-            if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
+            if (flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                 int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
 //                if (result == 0) {
 //                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
@@ -330,7 +327,7 @@ public class VehicleActiveService {
                         }
                     }
                 }
-                if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
+                if (!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                 }
@@ -340,7 +337,6 @@ public class VehicleActiveService {
 
 
     public void updateBookRecordStatus(VehicleBookRecord vehicleBookRecord, Integer type) {
-
         if (vehicleBookRecord != null) {
             if (type == 1) {
                 vehicleBookRecord.setActualStartDate(new Date());
@@ -355,9 +351,9 @@ public class VehicleActiveService {
     }
 
 
-
     /**
      * 车辆保养
+     *
      * @param vehicleUpkeepVo
      */
     @Transactional
@@ -411,6 +407,7 @@ public class VehicleActiveService {
 
     /**
      * 保养结束
+     *
      * @param vehicleUpkeepEndVo
      */
     @Transactional

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -475,6 +475,9 @@
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v3.number_plate like concat('%', #{keywords}, '%') or v3.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -383,6 +383,9 @@
             <if test="numberPlate != null">
                 and v1.number_plate = #{numberPlate}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (v1.number_plate like concat('%', #{keywords}, '%') or v1.code like concat('%', #{keywords}, '%'))
+            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>