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

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

@@ -274,8 +274,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
-            Integer mileage = orderVehicleCrosstownDto.getMileage() != null ? orderVehicleCrosstownDto.getMileage() : 0;
-            vehicleDepartureVo.setMileage(mileage);
+            if (orderVehicleCrosstownDto.getMileage() == null) {
+                vehicleDepartureVo.setMileage(0);
+            } else {
+                vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
+            }
+
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             if (checkUserInfoDto != null) {
                 vehicleDepartureVo.setCheckMan(checkUserInfoDto.getUsername());
@@ -284,10 +288,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             log.info("小程序订单出车： " + vehicleDepartureVo.toString());
             try {
                 RestResponse restResponse = vehicleFeign.departureBySmall(vehicleDepartureVo);
+                log.info("小程序订单出车成功： " + restResponse.getCode() + restResponse.getMessage());
                 if (restResponse.getStatus() != 200) {
                     return ObjectRestResponse.createFailedResult(1001, restResponse.getMessage());
                 }
-                log.info("小程序订单出车成功： " + restResponse.getCode() + restResponse.getMessage());
             } catch (Exception e) {
                 return ObjectRestResponse.createFailedResult(1001, e.getMessage());
             }
@@ -295,7 +299,11 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             VehicleArrivalVo vehicleArrivalVo = new VehicleArrivalVo();
             vehicleArrivalVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleArrivalVo.setArrivalBranchCompanyId(userDTO.getCompanyId());
+            if (orderVehicleCrosstownDto.getMileage() == null) {
+                vehicleArrivalVo.setMileage(0);
+            } else {
                 vehicleArrivalVo.setMileage(orderVehicleCrosstownDto.getMileage());
+            }
             if (checkUserInfoDto != null) {
                 vehicleArrivalVo.setRecycleMan(checkUserInfoDto.getUsername());
                 vehicleArrivalVo.setRecycleManTel(checkUserInfoDto.getTelephone());

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

@@ -238,6 +238,10 @@ public class VehicleActiveService {
             }
             //2019-11-22 16:30 还原还车时修改车辆停靠分公司需求
             vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+            //当所属门店和还车门店一致，修改经营门店为还车门店
+            if (vehicle.getSubordinateBranch().equals(vehicleBookRecord.getRetCompany())) {
+                vehicle.setManageCompanyId(vehicleBookRecord.getRetCompany());
+            }
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());

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

@@ -1494,7 +1494,7 @@
                 AND  v.`category_id`= #{categoryId}
             </if>
             <if test="branchId != null and branchId > 0">
-                AND  v.`subordinate_branch`= #{branchId}
+                AND  v.`manage_company_id`= #{branchId}
             </if>
             <if test="state != null ">
                 AND  v.`state`= #{state}