Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSav...

puzhibing

2023-08-17 d0c88e9f82a73e225ec04f3f8b533cf1d97028bc

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving

 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/impl/OrderServiceImpl.java

@@ -1178,6 +1178,9 @@
        Driver driver=null;
        OrderTransfer orderTransfer = new OrderTransfer();
        Order order = this.selectById(orderId);
        if(order.getState() > 104){
            return ResultUtil.error("订单不支持转单");
        }
        if(phone!=null && !"".equals(phone)) {
            Integer oldId = order.getDriverId();
            List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("phone", phone));
@@ -1203,9 +1206,7 @@
        }else {
            order.setState(201);
        }
        if(order.getState() > 104){
            return ResultUtil.error("订单不支持转单");
        }

        order.setOldState(order.getState());

        this.updateById(order);

 user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/OrderController.java

@@ -86,7 +86,7 @@
            Integer i =0; // 0为不能接单 1为恶劣天气  2为节假日 3为恶劣+节假日
            District geocode = MapUtil.geocode(lon, lat);
            String districtCode = geocode.getDistrictCode();
            List<BranchOffice> districtCode1 = branchOfficeService.selectList(new EntityWrapper<BranchOffice>().eq("districtCode", districtCode));
            List<BranchOffice> districtCode1 = branchOfficeService.selectList(new EntityWrapper<BranchOffice>().eq("districtCode", districtCode).eq("status",1));
            if(districtCode1.size()>0){
                BranchOffice branchOffice = districtCode1.get(0);
                Integer id = branchOffice.getId();