咸宁二期司机端

xuhy

2025-01-08 7b5d15ad8773c4a2e957638cc3936feb68460e93

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -34,6 +34,8 @@

    @Autowired
    private IDriverService driverService;
    @Autowired
    private ICompanyService companyService;

    @Autowired
    private IUserRedPacketRecordService userRedPacketRecordService;
@@ -196,10 +198,11 @@
//        String track = gdFalconUtil.createTrack(s);
//        orderTaxi.setTrackId(track);
        if (orderTaxi.getAudioLinkUrl()!=null){
            List<TUseMoney> money = useMoneyMapper.selectList(null);
//            List<TUseMoney> money = useMoneyMapper.selectList(null);
            Company company = companyService.selectById(driver.getCompanyId());
            orderTaxi.setState(9);
            driver.setState(2);
            driver.setBalance(driver.getBalance() - money.get(0).getMoney());
            driver.setBalance(driver.getBalance() - company.getFixedDeduction());

            driverService.updateById(driver);
            Car car = carService.selectById(driver.getCarId());
@@ -439,15 +442,23 @@
                orderTaxi.setState(6);
                orderTaxi.setEndServiceTime(new Date());

                List<TUseMoney> money = useMoneyMapper.selectList(null);
//                List<TUseMoney> money = useMoneyMapper.selectList(null);
                Driver driver = driverService.selectById(orderTaxi.getDriverId());
                driver.setBalance(driver.getBalance() - money.get(0).getMoney());
                // 新增扣除使用费记录
                Company company = companyService.selectById(driver.getCompanyId());
                TransactionDetails transactionDetails = new TransactionDetails();
                if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
                    double v = company.getPercentageDeduction() / 100;
                    v = v * orderTaxi.getOrderMoney();
                    driver.setBalance(driver.getBalance() - v);
                    transactionDetails.setMoney(v);
                }else {
                    driver.setBalance(driver.getBalance() - company.getFixedDeduction());
                    transactionDetails.setMoney(company.getFixedDeduction());
                }
                // 新增扣除使用费记录
                transactionDetails.setUserId(driver.getId());
                transactionDetails.setInsertTime(new Date());
                transactionDetails.setRemark("软件使用费");
                transactionDetails.setMoney(money.get(0).getMoney());
                transactionDetails.setState(2);
                transactionDetails.setType(1);
                transactionDetails.setUserType(2);