From a661e711cebd9f0b684dc73ab732b239812f076f Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期日, 28 四月 2024 09:23:08 +0800
Subject: [PATCH] 新增加功能
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
index e858a79..e4da94f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java
@@ -1252,18 +1252,18 @@
case 4:
OrderLogistics orderLogistics = orderLogisticsService.selectById(map.get("incomeId").toString());
List<Income> incomes3 = incomeService.queryData(1, null, 2, orderLogistics.getId(), 4);
- map1.put("travelMoney", orderLogistics != null ? orderLogistics.getTravelMoney() : 0);//行程费
+ map1.put("travelMoney", orderLogistics != null ? orderLogistics.getOrderMoney() : 0);//行程费
map1.put("parkMoney", 0);//停车费
- map1.put("tipMoney", orderLogistics != null ? orderLogistics.getTipMoney() : 0);//小费
+ map1.put("tipMoney", 0);//小费
map1.put("roadTollMoney", 0);//过路费
map1.put("rakeMoney", incomes3.size() > 0 ? incomes3.get(0).getMoney() : 0);//抽成
break;
case 5:
OrderLogistics orderLogistics1 = orderLogisticsService.selectById(map.get("incomeId").toString());
List<Income> incomes4 = incomeService.queryData(1, null, 2, orderLogistics1.getId(), 5);
- map1.put("travelMoney", orderLogistics1 != null ? orderLogistics1.getTravelMoney() : 0);//行程费
+ map1.put("travelMoney", orderLogistics1 != null ? orderLogistics1.getOrderMoney() : 0);//行程费
map1.put("parkMoney", 0);//停车费
- map1.put("tipMoney", orderLogistics1 != null ? orderLogistics1.getTipMoney() : 0);//小费
+ map1.put("tipMoney", 0);//小费
map1.put("roadTollMoney", 0);//过路费
map1.put("rakeMoney", incomes4.size() > 0 ? incomes4.get(0).getMoney() : 0);//抽成
break;
--
Gitblit v1.7.1