修改 bug

Pu Zhibing

2024-12-25 21ffc8e1bd503a662c9eba2a6cb8319b350d6ceb

 ManagementAHTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TReassignController.java

@@ -917,6 +917,7 @@
        tOrderPrivateCar.setState(tOrderPrivateCar.getOldState());
        tOrderPrivateCar.setDriverId(driverId);
        tOrderPrivateCar.setCarId(nowDriver.getCarId());
        tOrderPrivateCar.setCompanyId(nowDriver.getCompanyId());
        itOrderPrivateCarService.updateById(tOrderPrivateCar);

        //修改专车改派订单
@@ -1001,6 +1002,7 @@
        }

        //修改订单数据
        tOrderCrossCity.setCompanyId(driver.getCompanyId());
        tOrderCrossCity.setDriverId(driverId);
        tOrderCrossCity.setCarId(driver.getCarId());
        tOrderCrossCity.setSeatNumber(seat1);
@@ -1021,25 +1023,7 @@
        tReassign.setState(3);
        tReassign.setCompleteTime(new Date());
        tReassignService.updateById(tReassign);

        //修改收入明细，转给新司机（因为是先支付金额）
        List<Income> incomes = incomeService.selectList(new EntityWrapper<Income>().eq("userType", 2).eq("objectId", oldDriver.getId()).eq("type", 2).eq("incomeId", tReassign.getOrderId()).eq("orderType", 3));
        if(incomes.size() > 0){
            Income income = incomes.get(0);
            income.setObjectId(driverId);
            incomeService.updateById(income);

            oldDriver.setBusinessMoney(oldDriver.getBusinessMoney() - income.getMoney());
            oldDriver.setLaveBusinessMoney(oldDriver.getLaveBusinessMoney() - income.getMoney());
            oldDriver.setBalance(oldDriver.getBalance().subtract(new BigDecimal(income.getMoney())));

            driver.setBusinessMoney(driver.getBusinessMoney() + income.getMoney());
            driver.setLaveBusinessMoney(driver.getLaveBusinessMoney() + income.getMoney());
            driver.setBalance(driver.getBalance().add(new BigDecimal(income.getMoney())));

        }
        itDriverService.updateById(oldDriver);
        itDriverService.updateById(driver);
        
        //增加推送
        Map<String,String> map = new HashMap<>();
        map.put("orderId", tOrderCrossCity.getId().toString());
@@ -1064,6 +1048,7 @@
        //修改专车订单
        tOrderLogistics.setState(tOrderLogistics.getOldState());
        tOrderLogistics.setDriverId(driverId);
        tOrderLogistics.setCompanyId(nowDriver.getCompanyId());
        tOrderLogistics.setCarId(nowDriver.getCarId());
        orderLogisticsService.updateById(tOrderLogistics);

@@ -1123,6 +1108,7 @@
        //修改专车订单
        orderTransfer.setState(orderTransfer.getOldState());
        orderTransfer.setDriverId(driverId);
        orderTransfer.setCompanyId(nowDriver.getCompanyId());
        orderTransfer.setCarId(nowDriver.getCarId());
        orderTransferService.updateById(orderTransfer);