Merge branch 'master-chw' into dev-chw

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java

@@ -6,9 +6,7 @@ import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
 import com.xxfc.platform.order.pojo.DedDetailDTO;
 import lombok.Data;
 
-import java.util.Date;
 import java.math.BigDecimal;
-import java.util.Date;
 import java.util.List;
 
 @Data

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

@@ -97,10 +97,6 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
     public List<OrderVehicleCrosstownDto> selectByOrderId(OrderVehicleCrosstownDto orderVehicleCrosstownDto) throws BaseException{
-        UserDTO byAppUser = getBusinessUserByAppUser();
-        if (byAppUser == null ) {
-           throw new BaseException(ResultCode.RSTOKEN_EXPIRED_CODE);
-        }
         if (StringUtils.isNotBlank(orderVehicleCrosstownDto.getTypes())) {
             String[] types = orderVehicleCrosstownDto.getTypes().split(",");
             orderVehicleCrosstownDto.setTypeList(Lists.newArrayList(types));
@@ -248,7 +244,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         if (orderVehicleCrosstownDto.getType() == CrosstownTypeEnum.DEPARTURE.getCode()) {
             boolean flag = getTodayTime(orderRentVehicleDetail.getStartTime(), orderRentVehicleDetail.getEndTime());
             if (!flag) {
-                return ObjectRestResponse.createFailedResult(3502, "已超过预定还车时间，不能进行交车操作！");
+                return ObjectRestResponse.createFailedResult(3502, "未到取车日期，无法进行交车操作，请核实订单信息！");
             }
             if (null == userDTO.getCompanyIds() || !userDTO.getCompanyIds().contains(orderRentVehicleDetail.getStartCompanyId())) {
                 return ObjectRestResponse.createFailedResult(3501, "无交车权限");
@@ -278,7 +274,8 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             vehicleDepartureVo.setVehicleId(orderRentVehicleDetail.getVehicleId());
             vehicleDepartureVo.setDepartureBranchCompanyId(orderRentVehicleDetail.getStartCompanyId());
             vehicleDepartureVo.setExpectArrivalBranchCompanyId(orderRentVehicleDetail.getEndCompanyId());
-            vehicleDepartureVo.setMileage(orderVehicleCrosstownDto.getMileage());
+            Integer mileage = orderVehicleCrosstownDto.getMileage() != null ? orderVehicleCrosstownDto.getMileage() : 0;
+            vehicleDepartureVo.setMileage(mileage);
             vehicleDepartureVo.setBookRecordId(orderRentVehicleDetail.getBookRecordId());
             if (checkUserInfoDto != null) {
                 vehicleDepartureVo.setCheckMan(checkUserInfoDto.getUsername());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -391,7 +391,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
             userDTO = userFeign.businessUserinfoByMobilePhone(getAppUser().getUsername()).getData();
         }
         if (userDTO == null) {
-            return ObjectRestResponse.succ(new PageDataVO<>());
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, ResultCode.getMsg(ResultCode.RSTOKEN_EXPIRED_CODE));
         }
         if (StringUtils.isBlank(orderNo)) {
             return ObjectRestResponse.paramIsEmpty();

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

@@ -205,7 +205,7 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        if (MileageRest != null && MileageRest1 >= MileageRest) {
+        if (MileageRest == null || MileageRest1 >= MileageRest) {
             VehicleBookRecord vehicleBookRecord = null;
             if (arrivalVo.getBookRecordId() != null) {
                 vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());

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

@@ -1778,7 +1778,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                             }
                             handleOption.put("update", true);// 编辑操作
                         }
-                        vehicleVO.setRecordEmploy(recordEmployBiz.getInfo(vehicleId));
                     }else if (type == 3){
                         //类型是申请经营并且申请公司是停靠公司
                         if (vehicleManageApply !=null && vehicleManageApply.getApplyId().equals(parkBranchCompanyId)  && vehicleManageApply.getType() == 1){
@@ -1804,6 +1803,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                             handleOption.put("return", true);// 还车操作
                         }
                     }
+                    vehicleVO.setRecordEmploy(recordEmployBiz.getInfo(vehicleId));
                     vehicleVO.setStatusText(statusText);
                     vehicleVO.setHandleOption(handleOption);
                     vehicleVO.setVehicleTitle(vehicleTitle);

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

@@ -1569,7 +1569,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}