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

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

@@ -261,15 +261,15 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
         }
         BigDecimal amount = new BigDecimal(cost.toString()).divide(new BigDecimal("1"), 2, BigDecimal.ROUND_UP);
-        orderVehicleCrosstownDto.setDeductionCost(amount);
+        //出车成功后修改订单状态
+        List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
+        if (oldValue.size() == 1) {
+            orderVehicleCrosstownDto.setDeductionCost(oldValue.get(0).getDeductionCost().add(amount));
             //扣除费用
             orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
             if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
                 return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
             }
-        //出车成功后修改订单状态
-        List<OrderVehicleCrosstownDto> oldValue = orderVehicleCrosstownBiz.selectByOrderId(orderVehicleCrosstownDto);
-        if (oldValue.size() == 1) {
             BeanUtil.copyProperties(orderVehicleCrosstownDto, oldValue.get(0), CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             getOrderLicense(orderVehicleCrosstownDto);
             handleOrderStatus(baseOrder, orderRentVehicleDetail, oldValue.get(0));
@@ -280,6 +280,12 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
             }
             return ObjectRestResponse.succ(oldValue.get(0));
         } else if (oldValue.size() <= 0) {
+            orderVehicleCrosstownDto.setDeductionCost(amount);
+            //扣除费用
+            orderVehicleCrosstownDto.setRestDeposit(orderRentVehicleDetail.getDeposit().subtract(orderVehicleCrosstownDto.getDeductionCost()));
+            if (orderVehicleCrosstownDto.getRestDeposit().compareTo(getAmount()) == -1) { //剩余金额小于保证金
+                return ObjectRestResponse.createFailedResult(500, "押金不足，不能交车，请联系客服！");
+            }
             getOrderLicense(orderVehicleCrosstownDto);
             orderVehicleCrosstownBiz.insertSelective(orderVehicleCrosstownDto);
             OrderVehicleCrosstown orderVehicleCrosstown = orderVehicleCrosstownBiz.selectOne(orderVehicleCrosstownDto);
@@ -343,13 +349,21 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 BigDecimal cost = amount.multiply(new BigDecimal(usedDay)).multiply(new BigDecimal(2));
                 updateCrossRefund(orderVehicleCrosstown, cost, OrderViolateEnum.AFTER.getCode());
             }
-        }
 
             if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.ARRIVE.getCode()) {//不定损直接还车
                 //添加非定损记录
+                Integer orderId = baseOrder.getId();
+                List<OrderVehicleCrosstownDto> list = orderVehicleCrosstownBiz.selectByOrderId(new OrderVehicleCrosstownDto(){{
+                    setOrderId(orderId);
+                    setType(CrosstownTypeEnum.ARRIVE.getCode());
+                }});
+                if(list != null && list.size() > 0) {
+                    OrderVehicleCrosstownDto orderVehicleCrosstownDto = list.get(0);
+                    OrderVehicleCrosstown orderVehicleCrosstown1 = new OrderVehicleCrosstown();
+                    BeanUtil.copyProperties(orderVehicleCrosstownDto, orderVehicleCrosstown1, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
                     DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
                     depositRefundRecord.setAmount(orderVehicleCrosstown.getDeductionCost());
-            depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown.getDeductionCost()));
+                    depositRefundRecord.setRestAmount(totalAmount.subtract(getAmount()).subtract(orderVehicleCrosstown1.getDeductionCost()));
                     depositRefundRecord.setTotalAmount(totalAmount.subtract(getAmount()));
                     depositRefundRecord.setCrosstownId(orderVehicleCrosstown.getId());
                     orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
@@ -360,6 +374,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                     orderRentVehicleDetail.setFixedLossStatus(0);
                     orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
                     baseOrderBiz.sendOrderMq(orderRentVehicleDetail, null, null, baseOrder, OrderMQDTO.ORDER_FINISH);
+                }
             } else if (orderVehicleCrosstown.getType() == CrosstownTypeEnum.FIXED_LOSS.getCode()) { //定损还车，添加定损记录
                 //添加定损记录
                 DepositRefundRecord depositRefundRecord = new DepositRefundRecord();
@@ -373,6 +388,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 orderRentVehicleDetail.setFixedLossStatus(1);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);
+            }
         } else if (baseOrder.getStatus() == OrderStatusEnum.ORDER_FIXED_LOSS.getCode()) {//定损后还车
             DepositRefundRecord depositRefundRecord = orderDepositRefundRecordBiz.findByCrossIdAndStatus(orderVehicleCrosstown.getId(), DepositRefundStatus.FIXLOSSREFUND.getCode());
             if (depositRefundRecord != null) {
@@ -401,6 +417,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
         }
     }
 
+
     public void updateCrossRefund(OrderVehicleCrosstown orderVehicleCrosstown, BigDecimal cost, Integer type) {
         DedDetailDTO dedDetailDTO = new DedDetailDTO();
         String detailName = null;

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

@@ -59,7 +59,6 @@ public class VehicleActiveService {
      * @param departureVo
      */
     public void departure(VehicleDepartureVo departureVo) {
-        try {
         Vehicle vehicle = vehicleMapper.selectByPrimaryKey(departureVo.getVehicleId());
         if (vehicle == null) {
             throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNEXIST.getDesc(),
@@ -86,11 +85,9 @@ public class VehicleActiveService {
             vehicle.setMileageLastUpdate(MileageLift1);
             vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
             // 修改车辆状态，确认是空闲状态
             int result = vehicleMapper.updateStatusByIdAndStatus(departureVo.getVehicleId(), VehicleStatus.DEPARTURE.getCode(),
                     VehicleStatus.NORMAL.getCode());
-
             if (!vehicle.getStatus().equals(VehicleStatus.NORMAL.getCode())) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
@@ -133,9 +130,8 @@ public class VehicleActiveService {
                     departureLog.setUserTel(vehicleBookRecord.getVehicleUserPhone());
                 }
                 vehicleDepartureLogMapper.insert(departureLog);
+                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             }
-
-
             // 车辆活动日志
             VehicleActiveLog activeLog = new VehicleActiveLog();
             activeLog.setVehicleId(departureVo.getVehicleId());
@@ -147,10 +143,6 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                     ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
     }
 
 
@@ -202,10 +194,6 @@ public class VehicleActiveService {
                 throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                         ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
             }
-//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//        }
             Integer Mileagerest = vehicle.getMileageLastUpdate();
             Integer Mileagerest1 = arrivalVo.getMileage();
             if (Mileagerest1 == null) {
@@ -218,7 +206,6 @@ public class VehicleActiveService {
                     vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
                     updateBookRecordStatus(vehicleBookRecord, 2);
                 }
-
                 // 写入车辆公里数,还车分公司id
                 vehicle.setMileageLastUpdate(Mileagerest1);
                 if (vehicleBookRecord != null) {
@@ -226,12 +213,8 @@ public class VehicleActiveService {
                 }
                 vehicle.setExpectDestinationBranchCompanyId(0);
                 vehicleMapper.updateByPrimaryKeySelective(vehicle);
-
-
-
                 // 出车记录
                 VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
-
                 if (departureLogVo == null) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
@@ -248,10 +231,6 @@ public class VehicleActiveService {
                 }
                 if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
                     int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
-//                if (result == 0) {
-//                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-//                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-//                }
                 }
 
                 DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
@@ -298,23 +277,7 @@ public class VehicleActiveService {
                 activeLog.setEndTime(new Date());
                 activeLog.setUpdateTime(new Date());
                 vehicleActiveLogMapper.updateByPrimaryKeySelective(activeLog);
-
-                //取消预定时间 bookInfo和bookRecord
-//            BookVehicleVO bookVehicleVo = new BookVehicleVO();
-//            BeanUtils.copyProperties(vehicleBookRecord, bookVehicleVo);
-//            bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
-//            bookVehicleVo.setBookStartDate(null);
-//            bookVehicleVo.setBookEndDate(null);
-//            bookVehicleVo.setUnbookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DATE_TIME_FORMATTER));
-//            bookVehicleVo.setUnbookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DATE_TIME_FORMATTER));
-//           try {
-//               Boolean hasSuc = vehicleBiz.unbookVehicle(bookVehicleVo);
-//               if(!hasSuc){
-//                   throw new BaseException(ResCode.VEHICLE_UNBOOK_FAIL.getDesc(), ResCode.VEHICLE_UNBOOK_FAIL.getCode());
-//               }
-//           } catch ( Exception e) {
-//                e.printStackTrace();
-//           }
+                log.info("收车成功： 收车记录：departureLog = {}", departureLog.toString());
             } else {
                 throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(),
                         ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());