Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-common/pom.xml

@@ -204,6 +204,11 @@
             <groupId>org.springframework.amqp</groupId>
             <artifactId>spring-amqp</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot</artifactId>
+            <version>2.1.3.RELEASE</version>
+        </dependency>
 
     </dependencies>
 

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -15,6 +15,17 @@ public class ResultCode {
 	public static int SUCCESS_CODE = Integer.valueOf(SystemProperty.getResultConfig("SUCCESS_CODE"));
 	// 操作失败
 	public static int FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("FAILED_CODE"));
+
+	// 车辆预定失败，请重试
+	public static int BOOKED_FAILED_CODE = Integer.valueOf(SystemProperty.getResultConfig("BOOKED_FAILED_CODE"));
+	// 车辆预定失败，请重试
+	public static int ONLY_BOOK_FROM_TODAY = Integer.valueOf(SystemProperty.getResultConfig("BOOKED_FAILED_CODE"));
+	// 添加车辆失败，请重试
+	public static int ADD_VEHICLE_FAIL = Integer.valueOf(SystemProperty.getResultConfig("ADD_VEHICLE_FAIL"));
+
+	// 修改车辆失败，请重试
+	public static int UPDATE_VEHICLE_FAIL = Integer.valueOf(SystemProperty.getResultConfig("UPDATE_VEHICLE_FAIL"));
+
 	// 操作失败
 	public static int NULL_CODE = Integer.valueOf(SystemProperty.getResultConfig("NULL_CODE"));
 	// 操作出现异常

ace-common/src/main/resources/properties/resultcod.properties

@@ -208,4 +208,18 @@ WRONG_FORMAT_OF_ID_CARD=4005
 4005=证件格式错误！
 #资料不全
 INCOMPLETE_DATA=4006
-4006=资料不齐全！
+4006=资料不齐全！
\ No newline at end of file
+
+BOOKED_FAILED_CODE = 4007
+4007=车辆预定失败，请重试！
+
+ONLY_BOOK_FROM_TODAY = 4008
+4008=预定时间不能小于当前时间
+
+ADD_VEHICLE_FAIL = 4009
+4009 = 添加车辆失败，请重试
+
+UPDATE_VEHICLE_FAIL = 4010
+4010 = 修改车辆失败，请重试
+
+

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

@@ -28,6 +28,7 @@ import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.MQSenderFeign;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
@@ -126,17 +127,17 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String no, UserDTO userDTO) {
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
         if (orderPageVo == null) {
-            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
         if(orderPageVo.getStatus() <= 3 && orderPageVo.getStatus() != 2 && orderPageVo.getStatus() != -1) {
-            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_DETAIL_IS_NOT_EXIST.getCode(), ResCode.ORDER_DETAIL_IS_NOT_EXIST.getDesc());
         }
         List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
         List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
 
         if (orderPageVo.getOrderRentVehicleDetail() != null) {
             if (!companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getStartCompanyId()) && !companyIds.contains(orderPageVo.getOrderRentVehicleDetail().getEndCompanyId())) {
-                return ObjectRestResponse.createFailedResult(2563, "您无权限查看此订单！");
+                return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
             }
             if(userDTO.getCompanyId() == orderPageVo.getOrderRentVehicleDetail().getEndCompanyId()) {
                 orderPageVo.setUserCompanyStatus(true);
@@ -228,7 +229,7 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> {
     public ObjectRestResponse<OrderPageVO> getOrderDetail(String no) {
         OrderPageVO orderPageVo = mapper.getOrderDetail(no);
         if (orderPageVo == null) {
-            return ObjectRestResponse.createFailedResult(3501, "订单不存在");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
         if (orderPageVo.getOrderRentVehicleDetail() != null) {
             if (orderPageVo.getStatus() == 4) { //未交车

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

@@ -86,6 +86,10 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
         }
     }
 
+    public void save(DepositRefundRecord depositRefundRecord) {
+        mapper.insert(depositRefundRecord);
+    }
+
 
     public List<DepositRefundRecord> selectByCrossId(Integer cross) {
         List<DepositRefundRecord> list = mapper.selectByCrossId(cross);
@@ -149,7 +153,7 @@ public class OrderDepositRefundRecordBiz extends BaseBiz<DepositRefundRecordMapp
             newValue.setRestAmount(depositRefundRecord.getTotalAmount().subtract(orderViolation.getPrice()));//减去违章金之后的押金
             newValue.setIscomplete(false);
             newValue.setId(null);
-            insertSelectiveRe(newValue);
+            mapper.insert(newValue);
             depositRefundRecord.setIsshow(false);
             updateSelectiveByIdRe(depositRefundRecord);
         } else {

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

@@ -2,7 +2,6 @@ package com.xxfc.platform.order.biz;
 
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.entity.BaseOrder;
@@ -12,14 +11,11 @@ import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import com.xxfc.platform.order.pojo.order.OrderTourVerificationVO;
 import com.xxfc.platform.tour.feign.TourFeign;
 import com.xxfc.platform.tour.vo.TourGoodOrderFindVo;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.Instant;
-import java.time.LocalTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -66,10 +62,10 @@ public class OrderTourVerificationBiz{
         baseOrder.setNo(no);
          baseOrder=baseOrderBiz.selectOne(baseOrder);
         if(baseOrder==null){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "订单不存在");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
         if(baseOrder.getStatus()!=OrderStatusEnum.ORDER_TOSTART.getCode()){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "订单不是已支付状态");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_PAY.getCode(), ResCode.ORDER_IS_NOT_PAY.getDesc());
         }
        Integer orderId=baseOrder.getId();
         Integer version=baseOrder.getVersion();
@@ -77,7 +73,7 @@ public class OrderTourVerificationBiz{
         tourDetail.setOrderId(orderId);
         tourDetail=tourDetailBiz.selectOne(tourDetail);
         if(tourDetail==null){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "订单不存在");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
         Integer verificationId=tourDetail.getVerificationId();
         Integer total_number=tourDetail.getTotalNumber();
@@ -86,7 +82,8 @@ public class OrderTourVerificationBiz{
             if(companyId!=null){
                 boolean falg=isPower(list,companyId);
                 if(!falg){
-                    return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "无权限操作");
+                    return ObjectRestResponse.createFailedResult(ResCode.YOU_AUTH_FAIL.getCode(), ResCode.YOU_AUTH_FAIL.getDesc());
+
                 }
             }
         }

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.contant.enumerate.CrosstownTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.DepositRefundStatus;
@@ -23,6 +24,7 @@ import com.xxfc.platform.universal.constant.DictionaryKey;
 import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
@@ -138,15 +140,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         log.info("添加的参数：orderVehicaleCrosstown = {}", orderVehicleCrosstownDto);
         UserDTO userDTO = userInfoBiz.getAdminUserInfo();
         if (userDTO == null) {
-            return ObjectRestResponse.createFailedResult(508, "token is null or invalid");
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
         }
         if (orderVehicleCrosstownDto == null || orderVehicleCrosstownDto.getOrderId() == null) {
-            return ObjectRestResponse.createFailedResult(500, "参数为空！");
+            return ObjectRestResponse.paramIsEmpty();
         }
         orderVehicleCrosstownDto.setOrperaterId(userDTO.getId());
         BaseOrder baseOrder = baseOrderBiz.selectById(orderVehicleCrosstownDto.getOrderId());
         if (baseOrder == null) {
-            return ObjectRestResponse.createFailedResult(500, "订单不存在！");
+            return ObjectRestResponse.createFailedResult(ResCode.ORDER_IS_NOT_EXIST.getCode(), ResCode.ORDER_IS_NOT_EXIST.getDesc());
         }
 
         OrderRentVehicleDetail orderRentVehicleDetail = orderRentVehicleBiz.selectById(baseOrder.getDetailId());
@@ -281,8 +283,10 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
                 depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
+               //修改订单状态为已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
                 baseOrderBiz.updateSelectiveById(baseOrder);
+                //修改订单详情是否押金全部退还
                 orderRentVehicleDetail.setFixedLossStatus(0);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                 baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
@@ -307,12 +311,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 depositRefundRecord.setIsshow(false);
                 orderDepositRefundRecordBiz.updateSelectiveByIdRe(depositRefundRecord);
                 newValue.setIscomplete(true); //发起退款显示
-                depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-                depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
-                depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
+                newValue.setAmount(orderVehicleCrosstown.getDeductionCost());
+                newValue.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
+                newValue.setTotalAmount(totalAmount.subtract(getAmount()));
                 newValue.setCrosstownId(orderVehicleCrosstown.getId());
                 newValue.setId(null);
-                orderDepositRefundRecordBiz.insertSelectiveRe(newValue);
+                orderDepositRefundRecordBiz.save(newValue);
             } else {
                 throw new BaseException("定损记录不存在！请联系客服");
             }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/ResCode/ResCode.java

@@ -9,7 +9,7 @@ public enum ResCode {
 
 
     //车辆信息相关返回码-预定信息
-    VEHICLE_BOOKED_INFO_ALREADY_CHANGED(101001,"车辆预定信息已更改，请刷新后继续操作"),
+    VEHICLE_BOOKED_INFO_ALREADY_CHANGED(101001,"车辆预定信息已更改"),
 
     //车辆信息相关返回码-车辆信息
     VEHICLE_INFO_SAME_NUM_PLATE_EXISTS(102001,"该车牌已经存在"),
@@ -20,8 +20,8 @@ public enum ResCode {
     VEHICLE_INFO_IS_BOOKED(102004,"车辆已经被预定"),
 
     //车辆信息相关返回码-预定申请信息
-    VEHICLE_BOOKED_RECORD_ALREADY_CHANGED(103001,"车辆预定申请已被审批，请刷新后继续操作"),
-    VEHICLE_BOOKED_RECORD_STATUS_CHANGED(103002,"车辆预定申请状态已变更，请刷新后继续操作"),
+    VEHICLE_BOOKED_RECORD_ALREADY_CHANGED(103001,"车辆预定申请已被审批"),
+    VEHICLE_BOOKED_RECORD_STATUS_CHANGED(103002,"车辆预定申请状态已变更"),
     VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED(103003,"请输入仪表盘内当前显示的公里数"),
 
     VEHICLE_DEPARTURE_VEHICLE_UNEXIST(104001,"车辆不存在"),
@@ -44,9 +44,15 @@ public enum ResCode {
     VEHICLE_UPKEEP_ITEM_UNEXIST(106003, "保养项目不存在"),
     VEHICLE_UPKEEP_VEHICLE_UNUPKEEP(106004, "车辆不在保养中"),
 
+    VEHICLE_IS_BOOKED_TODAY(106006, "车辆当前时段已经被预定"),
+    FIND_VEHICLE_PLAT_FAILE(106007, "获取车型列表失败"),
+    UPDATE_VEHICLE_RANK_FAIL(106008, "修改车型列表失败"),
+    FIND_DATA_NOT_EXIST(106005, "查询的数据不存在"),
 
-
-
+    ORDER_IS_NOT_EXIST(10000, "订单不存在"),
+    ORDER_DETAIL_IS_NOT_EXIST(10001, "订单详情不可查询"),
+    YOU_AUTH_FAIL(-2,"无权限查看此信息"),
+    ORDER_IS_NOT_PAY(10002, "订单未支付"),
     ;
     /**
      * 返回码

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

@@ -223,7 +223,7 @@ public class VehicleActiveService {
         }
         if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
             // 车辆非正常状态
-            throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc(),
+            throw new BaseException(ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getDesc() + vehicle.getStatus(),
                     ResCode.VEHICLE_UPKEEP_VEHICLE_DISABLE.getCode());
         }
         Integer lastMileage=vehicleUpkeepVo.getMileage();

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

@@ -208,7 +208,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public RestResponse add(List<AddOrUpdateVehicleVo> addOrUpdateVehicleVoList) throws Exception{
 
         if(addOrUpdateVehicleVoList.size()>MAX_BATCH_SIZE_VEHICLE){
-            throw new CustomIllegalParamException("exceed max batch size");
+            throw new CustomIllegalParamException("添加的车辆数量过多！");
         }
 
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList) {
@@ -217,7 +217,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             BeanUtilsBean.getInstance().copyProperties(vehicle, addOrUpdateVehicleVo);
 
             if (addOrUpdateVehicleVo.getParkBranchCompanyId()==null) {
-                throw new CustomIllegalParamException("Stop at branch office cannot be empty");
+                throw new CustomIllegalParamException("停靠公司不能为空");
             }
 
             vehicle.setId(UUID.randomUUID().toString());
@@ -251,7 +251,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 //        }
 
         if(addOrUpdateVehicleVo.getNumberPlate() == null){
-            throw new CustomIllegalParamException("Without a license plate number");
+            throw new CustomIllegalParamException("车牌不能为空");
         }
         List<Vehicle> vehicles = mapper.lockByCode(addOrUpdateVehicleVo);
         return vehicles;
@@ -342,7 +342,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
             Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
             if(Boolean.FALSE.equals(rsEach)){
-                throw new BaseException(ResultCode.FAILED_CODE);
+                throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
             }
         }
 
@@ -377,7 +377,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         //修改相关车辆预定记录
         Boolean hasSuc = bookedVehicle(bookVehicleVo);
         if(!hasSuc){
-            throw new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.BOOKED_FAILED_CODE);
         }
 
         //添加随车物品
@@ -504,11 +504,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(yearMonthAndDate.size()>3){//连续的日期最多夸3个月
             throw new CustomIllegalParamException(" 只可以预约两个月内的车辆");
         }
-        //检查车辆是否可以预定
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
             Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicleId(),entry.getValue(),entry.getKey());
             if(Boolean.FALSE.equals(rsEach)){
-                throw new BaseException(ResultCode.FAILED_CODE);
+                throw new BaseException(ResultCode.VEHICLE_IS_BOOKED);
             }
         }
 
@@ -545,7 +544,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         //修改相关车辆预定记录
         Boolean hasSuc = bookedVehicle(bookVehicleVo);
         if(!hasSuc){
-            throw new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.BOOKED_FAILED_CODE);
         }
 
         //添加随车物品
@@ -1178,7 +1177,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     @Transactional
     public ObjectRestResponse save(Vehicle vehicle){
         if (vehicle==null) {
-           ObjectRestResponse.createDefaultFail();
+           ObjectRestResponse.paramIsEmpty();
         }
 
         String id = vehicle.getId();
@@ -1208,7 +1207,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             e.printStackTrace();
         } catch (InvocationTargetException e) {
             e.printStackTrace();
-          return   ObjectRestResponse.createDefaultFail();
+            log.info("获取车辆列表转换对象失败： vehicleVo = {}", vehicleVo);
         }
 
 
@@ -1262,8 +1261,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
     }
 
-
-
     public List<VehicleCountVo> countVehicleByParam(VehiclePlanDto vehiclePlanDto) {
         return mapper.countVehicleByParam(vehiclePlanDto);
     }
@@ -1281,7 +1278,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         vehiclePlanDto.setLimit(limit);
         UserDTO userDTO = getAdminUserInfo();
         if(userDTO == null) {
-            return ObjectRestResponse.createFailedResult(235, "token失效");
+            return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token失效");
         }
         List<Integer> companyList =  Lists.newArrayList();
         List<BranchCompany> branchCompany = branchCompanyBiz.getListByUser(userDTO);
@@ -1299,7 +1296,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 companyList.add(vehiclePlanDto.getParkBranchCompanyId());
             }
         }
-
         log.info("用户权限公司ID: companyList = {}", companyList);
         vehiclePlanDto.setCompanyIds(companyList);
         Query query = new Query(vehiclePlanDto);
@@ -1323,7 +1319,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             for(int i = 0; i < 24 - result.length(); i++) {
                 stringBuffer.append("0");
             }
-
             log.info(stringBuffer.toString());
         }
         stringBuffer.append(result);

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

@@ -4,8 +4,10 @@ import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleBookHourInfo;
 import com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleBookHourInfoDto;
@@ -42,7 +44,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
 
         //判定时间是否合法
         if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
-            throw new CustomIllegalParamException("you can only book from today");
+            throw new CustomIllegalParamException(ResultCode.getMsg(ResultCode.ONLY_BOOK_FROM_TODAY));
         }
         if (bookStartDate.compareTo(bookEndDate) > 0) {
             throw new CustomIllegalParamException("预定开始日期不能大于结束日期！");
@@ -100,14 +102,14 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse save(VehicleBookHourInfoDto vehicleBookHourInfoDto) {
         if(vehicleBookHourInfoDto == null) {
-            return ObjectRestResponse.createFailedResult(502, "参数为空");
+            return ObjectRestResponse.paramIsEmpty();
         }
         List<VehicleBookHourInfo> vehicleBookHourInfos = mapper.selectByVehicleAndDate(vehicleBookHourInfoDto);
         //有数据直接更新
         if(vehicleBookHourInfos.size() >=1) {
             for(VehicleBookHourInfo vehicleBookHourInfo : vehicleBookHourInfos) {
                 if(vehicleBookHourInfo.getBookedHour().equals(vehicleBookHourInfoDto.getBookedHour())) {
-                    return ObjectRestResponse.createFailedResult(504, "当天时间段已经被预定");
+                    return ObjectRestResponse.createFailedResult(ResCode.VEHICLE_IS_BOOKED_TODAY.getCode(), ResCode.VEHICLE_IS_BOOKED_TODAY.getDesc());
                 } else {
                     vehicleBookHourInfo.setBookedHour(vehicleBookHourInfo.getBookedHour() | vehicleBookHourInfoDto.getBookedHour());
                     updateSelectiveByIdRe(vehicleBookHourInfo);
@@ -130,7 +132,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     @CacheClear(key = "vehicle.hourInfo")
     public ObjectRestResponse delete(String vehicleId, List<String> dateList) {
             if(StringUtils.isBlank(vehicleId) || dateList.size() <= 0) {
-                return ObjectRestResponse.createFailedResult(502, "删除信息车辆Id为空");
+                return ObjectRestResponse.paramIsEmpty();
             }
             Map<String, Object> param = Maps.newHashMap();
             param.put("vehicleId", vehicleId);

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

@@ -116,7 +116,7 @@ public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper,
                 return ObjectRestResponse.succ(vehicleDepartureLog);
             }
         }
-        return ObjectRestResponse.createDefaultFail();
+        return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
     }
 
     @Transactional

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

@@ -8,7 +8,6 @@ import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.VehicleDispatchInfo;
 import com.xxfc.platform.vehicle.mapper.VehicleDispatchInfoMapper;
@@ -45,7 +44,7 @@ public class VehicleDispatchInfoBiz extends BaseBiz<VehicleDispatchInfoMapper,Ve
     //提交调度申请表单
     public ObjectRestResponse addDisspatchInfo(VehicleDispatchInfo vehicleDispatchInfo){
         if (vehicleDispatchInfo==null){
-            return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数为空");
+            return ObjectRestResponse.paramIsEmpty();
         }
         insertSelective(vehicleDispatchInfo);
         return  ObjectRestResponse.succ();

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

@@ -3,28 +3,25 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
-
-import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.mapper.VehicleModelMapper;
-import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * 车型
@@ -60,7 +57,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ObjectRestResponse.createDefaultFail();
+        return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
 
     }
 

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

@@ -7,11 +7,10 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
-import com.xxfc.platform.vehicle.entity.Vehicle;
+import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
@@ -20,14 +19,9 @@ import com.xxfc.platform.vehicle.pojo.CataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Arrays;
-import org.springframework.aop.framework.AopContext;
-import org.springframework.aop.framework.AopProxyUtils;
-import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
@@ -215,7 +209,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return ObjectRestResponse.createDefaultFail();
+        return ObjectRestResponse.createFailedResult(ResCode.FIND_VEHICLE_PLAT_FAILE.getCode(), ResCode.FIND_VEHICLE_PLAT_FAILE.getDesc());
     }
 
 
@@ -310,7 +304,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
     public ObjectRestResponse updateAndAdd(Cascade<VehiclePlatCata> cas) {
 
         if (cas == null || cas.getParent() == null) {
-            return ObjectRestResponse.createDefaultFail();
+            return ObjectRestResponse.paramIsEmpty();
         }
 
         //通过判断一级标签是否有id来判断是更新还是添加
@@ -337,7 +331,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             VehiclePlatCata parentVPC = cas.getParent();
             List<VehiclePlatCata> children = cas.getChildren();
             if (children == null || parentVPC == null) {
-                throw new BaseException("The tag name cannot be empty!");
+                throw new BaseException("标签名不能为空！");
             }
             //设置更新时间
             parentVPC.setUpdTime(System.currentTimeMillis());
@@ -353,7 +347,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
                     .collect(Collectors.toList());
             //判断有效数据是否为空
             if (VehiclePlatCatas.size() == 0) {
-                throw new BaseException("No valid subtag!");
+                throw new BaseException("父标签无效");
             }
             //遍历
             for (VehiclePlatCata VehiclePlatCata : VehiclePlatCatas) {
@@ -385,9 +379,8 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             return ObjectRestResponse.succ();
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BaseException(ResultCode.FAILED_CODE);
         }
-
+        return ObjectRestResponse.createFailedResult(ResCode.UPDATE_VEHICLE_RANK_FAIL.getCode(), ResCode.UPDATE_VEHICLE_RANK_FAIL.getDesc());
     }
 
     /**
@@ -407,7 +400,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             return ObjectRestResponse.succ();
         } catch (Exception e) {
             e.printStackTrace();
-            return ObjectRestResponse.createDefaultFail();
+            return ObjectRestResponse.createFailedResult(ResCode.UPDATE_VEHICLE_RANK_FAIL.getCode(), ResCode.UPDATE_VEHICLE_RANK_FAIL.getDesc());
         }
     }
 

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

@@ -18,8 +18,8 @@ import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VehicleModelVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,8 +37,6 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
-import static com.github.wxiaoqi.security.common.constant.CommonConstants.SYS_TRUE;
-
 /**
  * @author Administrator
  */
@@ -119,7 +117,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
 //            vmqc.setStatus(SYS_TRUE);
 //        }
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
-            return ObjectRestResponse.createDefaultFail();
+            return ObjectRestResponse.paramIsEmpty();
         }
         //结合车型
         if (org.apache.commons.lang3.StringUtils.isNotBlank(vmqc.getCatasStr())) {
@@ -141,7 +139,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Transactional
     public ObjectRestResponse<VehicleModel> add(@RequestBody VehicleModel vm, HttpServletRequest request) {
         if (vm == null) {
-            return ObjectRestResponse.createDefaultFail();
+            return ObjectRestResponse.paramIsEmpty();
         }
         if (StringUtils.isBlank(vm.getName())) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "车名不能为空");
@@ -159,9 +157,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         }
 
         String host = request.getRemoteHost();
-        if (StringUtils.isBlank(host)) {
-            return ObjectRestResponse.createDefaultFail();
-        }
         //设置信息
         vm.setCrtName(uorr.getData().getName());
         vm.setCrtUser(uorr.getData().getId());
@@ -194,7 +189,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         } catch (NumberFormatException e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.ADD_VEHICLE_FAIL);
         }
 
     }
@@ -213,9 +208,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
         }
         String host = request.getRemoteHost();
-        if (StringUtils.isBlank(host)) {
-            return ObjectRestResponse.createDefaultFail();
-        }
+
 //     插入修改时间
         vm.setUpdName(uorr.getData().getName());
         vm.setUpdUser(uorr.getData().getId());
@@ -247,7 +240,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         } catch (NumberFormatException e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
 
         }
     }
@@ -318,9 +311,6 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "获取不到用户信息");
         }
         String host = request.getRemoteHost();
-        if (StringUtils.isBlank(host)) {
-            return ObjectRestResponse.createDefaultFail();
-        }
         VehicleModel vehicleModel = new VehicleModel();
         vehicleModel.setId(id);
         vehicleModel.setStatus(status);
@@ -335,7 +325,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         } catch (NumberFormatException e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            throw new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.UPDATE_VEHICLE_FAIL);
 
         }
     }