From 6771fff413935485b5dce61769f133a44533d15c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期六, 30 五月 2026 14:35:14 +0800
Subject: [PATCH] fix

---
 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index df42808..2945009 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -636,32 +636,38 @@
     @Override
     public Double queryReassignMoney(Integer orderId, Integer orderType) throws Exception {
         Integer openCityId = null;
+        Integer companyId = null;
         switch (orderType){
             case 1://专车
                 OrderPrivateCar orderPrivateCar = orderPrivateCarService.selectById(orderId);
+                companyId = orderPrivateCar.getCompanyId();
                 openCityId = openCityService.openCity1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString()).getId();
                 break;
             case 2://出租
                 OrderTaxi orderTaxi = orderTaxiService.selectById(orderId);
+                companyId = orderTaxi.getCompanyId();
                 openCityId = openCityService.openCity1(orderTaxi.getStartLon().toString(), orderTaxi.getStartLat().toString()).getId();
                 break;
             case 3://城际
                 OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
+                companyId = orderCrossCity.getCompanyId();
                 openCityId = openCityService.openCity1(orderCrossCity.getStartLon().toString(), orderCrossCity.getStartLat().toString()).getId();
                 break;
             case 4://同城小件
                 OrderLogistics orderLogistics = orderLogisticsService.selectById(orderId);
+                companyId = orderLogistics.getCompanyId();
                 openCityId = openCityService.openCity1(orderLogistics.getStartLon().toString(), orderLogistics.getStartLat().toString()).getId();
                 break;
             case 5://跨城小件
                 OrderLogistics orderLogistics1 = orderLogisticsService.selectById(orderId);
+                companyId = orderLogistics1.getCompanyId();
                 openCityId = openCityService.openCity1(orderLogistics1.getStartLon().toString(), orderLogistics1.getStartLat().toString()).getId();
                 
                 break;
             case 6:
                 break;
         }
-        return sysReformistMapper.queryMoney(openCityId);
+        return sysReformistMapper.queryMoney(openCityId, companyId);
     }
 
 

--
Gitblit v1.7.1