fix bugs

longz

2026-05-11 496ef92b09b1be5dc1beb4ecf031cfc20edbeb94

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -25,6 +25,7 @@

import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;


@@ -516,10 +517,15 @@
                return ResultUtil.error("当前订单不能操作");
            }
        }
        Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
        switch (state){
            case 3://出发前往预约点
                orderPrivateCar.setState(3);
                orderPrivateCar.setSetOutTime(new Date());
                if (driver.getState() != 3) {
                    driver.setState(3);
                    driverService.updateById(driver);
                }
                systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderPrivateCar.getUserId(), 1);
                break;
            case 4://到达预约点，等待客户上车
@@ -544,6 +550,10 @@
                orderPrivateCar.setGetoffAddress(address);
                orderPrivateCar.setGetoffTime(new Date());
                orderPrivateCar.setEndServiceTime(new Date());
                if (driver.getState() != 2) {
                    driver.setState(2);
                    driverService.updateById(driver);
                }
                break;
        }
        orderPrivateCar.setCancelType(2);
@@ -1016,12 +1026,12 @@

        Map<String, Object> map = new HashMap<>();
        if(orderPrivateCar.getState() == 5){
            map.put("orderMoney", orderPrivateCar.getOrderMoney()==null?0:orderPrivateCar.getOrderMoney());//订单金额
            map.put("orderMoney", orderPrivateCar.getOrderMoney()==null?BigDecimal.ZERO:new BigDecimal(orderPrivateCar.getOrderMoney().toString()).setScale(2,RoundingMode.HALF_UP));//订单金额
        }else{
            if(orderPrivateCar.getAbnormal() == 2 && orderPrivateCar.getResponsibilityType() > 2 && orderPrivateCar.getAbnormalStatus() == 2){
                map.put("orderMoney", orderPrivateCar.getResponsibilityMoney());
            }else{
                map.put("orderMoney", orderPrivateCar.getOrderMoney()==null?0:orderPrivateCar.getOrderMoney());//订单金额
                map.put("orderMoney", orderPrivateCar.getOrderMoney()==null?BigDecimal.ZERO:new BigDecimal(orderPrivateCar.getOrderMoney().toString()).setScale(2,RoundingMode.HALF_UP));//订单金额
            }
        }
        map.put("startMileage", orderPrivateCar.getStartMileage());//起步价