From 496ef92b09b1be5dc1beb4ecf031cfc20edbeb94 Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期一, 11 五月 2026 13:59:14 +0800
Subject: [PATCH] fix bugs
---
DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
index 51e76ad..13cd458 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/IncomeServiceImpl.java
@@ -212,12 +212,12 @@
break;
case 3:
OrderCrossCity orderCrossCity = orderCrossCityService.selectById(orderId);
- if (orderCrossCity.getLineId() == -1){
+ driverId = orderCrossCity.getDriverId();
+ if (orderCrossCity.getLineId() <= -1){
company = companyService.selectById(orderCrossCity.getCompanyId());
- jsonObject = JSON.parseObject(company.getTaxi());
+ jsonObject = JSON.parseObject(company.getCross());
}else {
Line line = lineService.selectById(orderCrossCity.getLineId());
- driverId = orderCrossCity.getDriverId();
jsonObject = JSON.parseObject(line.getOutSetting());
}
rules = jsonObject.getJSONArray("rules");
--
Gitblit v1.7.1