更新

guyue

2025-08-18 9a8f26b7bb120bc7a00811c04c3667b60b9d16a4

更新

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/ServerCarModelController.java

@@ -66,4 +66,19 @@
            return ResultUtil.runErr();
        }
    }

    @ResponseBody
    @PostMapping("/queryServerCarModelsByType")
    @ApiOperation(value = "获取业务对应的所有车型", tags = {"用户端-包车","用户端-专车","用户端-跨城"}, notes = "")
    @ApiImplicitParams({
    })
    public ResultUtil<List<ServerCarModelWarpper>> queryServerCarModelsByType(Integer  type){
        try {
            List<Map<String, Object>> list = serverCarModelService.queryServerCarModels(type);
            return ResultUtil.success(ServerCarModelWarpper.getServerCarModelWarppers(list));
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();
        }
    }
}

 UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java

@@ -1258,7 +1258,7 @@
            orderCrossCity.setLineId(orderCrossCityWarpperPushOrder.getLineId());
//            orderCrossCity.setLineShiftDriverId(orderCrossCityWarpper.getLineShiftDriverId());
//            orderCrossCity.setCarId(orderCrossCityWarpper.getCarId());
//            orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
            orderCrossCity.setOrderNum(this.getOrderNum(orderCrossCityWarpperPushOrder.getDriverId(), orderCrossCityWarpperPushOrder.getLineShiftDriverId()));
            orderCrossCity.setPlacementLon(orderCrossCityWarpperPushOrder.getPlacementLon());
            orderCrossCity.setPlacementLat(orderCrossCityWarpperPushOrder.getPlacementLat());
            String placementAddress = orderCrossCityWarpperPushOrder.getPlacementAddress();
@@ -1310,8 +1310,8 @@
//            }

            //调用移动的小号接口
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
            Region region = regionMapper.query(geocode.get("districtCode"));
//            Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString());
//            Region region = regionMapper.query(geocode.get("districtCode"));
//            Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderCrossCity.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
//            if (String.valueOf(map.get("code")).equals("200")) {
//                orderCrossCity.setTelX(map.get("telX"));
@@ -2530,34 +2530,33 @@
                    if(ToolUtil.isNotEmpty(vehicle)){
                        integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
                    }
//                    Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
                    Company query = companyCityService.query(String.valueOf(orderCrossCity.getStartLon()), String.valueOf(orderCrossCity.getStartLat()));//获取起点所属分公司
//                    List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
                    Company query = companyService.selectById(1);
//                    Company query = companyService.selectById(1);
                    for(int i = 1; i <= 3; i++){
                        PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
                        //获取空闲司机
//                        List<Driver> list = driverService.queryIdleDriver(1, orderCrossCity.getServerCarModelId(), orderCrossCity.getStartLon(), orderCrossCity.getStartLat(), pushOrder.getPushDistance(), null);//所有附近空闲司机
//                        PushOrder pushOrder = pushOrderService.querys(i, 4, query.getId()).get(0);

                        //获取同线路的同车型的跨城司机
                        List<Driver> list = driverService.queryDriversByLineAndCarModel(3,orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId());
                        if(list.size() > 0){
                            double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
                            int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
                            list = list.subList(0, lastIndex);//获取空闲司机中占比数据
//                            double driverProportion = pushOrder.getDriverProportion() / 100;//推送占比计算成小数
//                            int lastIndex = Double.valueOf(list.size() * driverProportion).intValue();//计算占比转成整数（下标截取）
//                            list = list.subList(0, lastIndex);//获取空闲司机中占比数据
                            for(Driver driver : list){//开始进行推送
                                boolean bo = false;
                                for(Integer integer : integers){
                                    if(integer.compareTo(driver.getId()) == 0){
                                        bo = true;
                                        break;
                                    }
                                }
                                if(bo){
                                    continue;
                                }
                                pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), pushOrder.getPushTime());
//                                boolean bo = false;
//                                for(Integer integer : integers){
//                                    if(integer.compareTo(driver.getId()) == 0){
//                                        bo = true;
//                                        break;
//                                    }
//                                }
//                                if(bo){
//                                    continue;
//                                }
                                pushUtil.pushOrderState(2, driver.getId(), orderCrossCity.getId(), 3, orderCrossCity.getState(), 10);
                            }
                        }
                        Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
                        Thread.sleep(10 * 1000);//设置等待时间
                        Integer state = orderCrossCityMapper.selectById(orderCrossCity.getId()).getState();
                        if(state > 1){
                            break;
@@ -2566,10 +2565,8 @@
                        if(i == 3 && state == 1){
                            pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
                            orderIds.remove(orderCrossCity.getId());
                            OrderCrossCity orderCrossCity1 = orderCrossCityMapper.selectById(orderCrossCity.getId());
//                            if(orderCrossCity1.getState() == 7 && orderCrossCity1.getPayMoney() == null){
                                orderCrossCity1.setState(10);
                                orderCrossCityMapper.updateById(orderCrossCity1);
                                orderCrossCity.setState(10);
                                orderCrossCityMapper.updateById(orderCrossCity);

                                OrderCancel orderCancel = new OrderCancel();
                                orderCancel.setOrderId(orderCrossCity.getId());
@@ -2581,7 +2578,19 @@
                                orderCancel.setUserType(2);
                                orderCancelService.insert(orderCancel);
                                //TODO：退款
//                            }
                            UserInfo userInfo = userInfoService.selectById (orderCrossCity.getUserId());
                            userInfo.setBalance (new BigDecimal (userInfo.getBalance ())
                                    .add (new BigDecimal (orderCrossCity.getOrderMoney())) // 余额增加订单金额
                                    .setScale (2, BigDecimal.ROUND_HALF_EVEN)
                                    .doubleValue ());
                            SysIntegral query1 = sysIntegralMapper.query (orderCrossCity.getCompanyId ());
                            if (query1 != null) {
                                int addIntegral = orderCrossCity.getOrderMoney().intValue () * query1.getIntegral (); // 原增加的积分
                                userInfo.setIntegral (userInfo.getIntegral () - addIntegral); // 扣除对应积分（确保积分不为负可加额外判断）
                            }
                            transactionDetailsService.saveData (orderCrossCity.getUserId(), "订单取消退款", orderCrossCity.getOrderMoney (), 1, 1, 1, 3, orderCrossCity.getId ());
                            userInfoService.updateById (userInfo);

                        }
                    }
                } catch (Exception e) {