From 49e88798dcea0164f77c59f0be9eefdf67a3d228 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 17 七月 2024 15:03:10 +0800
Subject: [PATCH] 2.0bug修改
---
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html | 4 ++--
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 4 ++--
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java | 1 -
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html | 4 ++--
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java | 10 +++++++---
5 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
index ec4b5cf..1539fac 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/PlatformController.java
@@ -1695,9 +1695,13 @@
platformVO.setEndTime(format.format(income.getInsertTime()));
}
platformVO.setInsertTime(format.format(tOrderPrivateCar.getInsertTime()));
- String string = income.getMoney().toString();
- BigDecimal bigDecimal1 = new BigDecimal(string);
- platformVO.setMoney(bigDecimal1);
+ if (tOrderPrivateCar.getOrderMoney() != null){
+ String string = tOrderPrivateCar.getOrderMoney().toString();
+ BigDecimal bigDecimal1 = new BigDecimal(string);
+ platformVO.setMoney(bigDecimal1);
+ }else{
+ continue;
+ }
if (tOrderPrivateCar.getPayType() == null){
continue;
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
index 8ff141a..4ffda7d 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/DriverActivityController.java
@@ -250,7 +250,6 @@
, Integer num10
, Double num11
, String num12
-
) {
driverActivityService.insertOrUpdate(null,staTime,startTime, num1, num2
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index 8871383..fdc9937 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -83,8 +83,8 @@
driverActivityOnline.setType(1);
driverActivityOnline.setOnline(num4);
driverActivityOnline.setMoney(num5);
- driverActivityOnline.insertOrUpdate();
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
+ driverActivityOnline.insertOrUpdate();
// //添加在线活动-出租车
// driverActivityOnline = new DriverActivityOnline();
// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
@@ -170,8 +170,8 @@
driverActivityOnline.setType(1);
driverActivityOnline.setOnline(num4);
driverActivityOnline.setMoney(num5);
- driverActivityOnline.insertOrUpdate();
driverActivityOnline.setOfflineTime(Double.valueOf(num12));
+ driverActivityOnline.insertOrUpdate();
//添加在线活动-出租车
// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
// if(driverActivityOnline==null){
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
index 4bfe147..b6c58d3 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_detail.html
@@ -55,8 +55,8 @@
name="zc7" class="form-control newWidth" readonly/> GHS
<br/>
<br/>
- 连续在线 <input type="text" @if(isNotEmpty(item.offline)){
- value="${item.offline}"
+ 连续在线 <input type="text" @if(isNotEmpty(online1.offlineTime)){
+ value="${item.offlineTime}"
@}else{
value=""
@}
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
index 1c12ac6..fbcb784 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/driverActivity/driverActivity_edit.html
@@ -56,8 +56,8 @@
name="zc7" id="num5" class="form-control newWidth"/> GHS
<br/>
<br/>
- 连续在线 <input type="text" @if(isNotEmpty(item.offline)){
- value="${item.offline}"
+ 连续在线 <input type="text" @if(isNotEmpty(item.offlineTime)){
+ value="${item.offlineTime}"
@}else{
value=""
@}
--
Gitblit v1.7.1