From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
index e4228e0..c4a49ec 100644
--- a/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
+++ b/ManagementNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java
@@ -168,19 +168,19 @@
driverActivityOnline.setMoney(num5);
driverActivityOnline.insertOrUpdate();
//添加在线活动-出租车
- driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
- if(driverActivityOnline==null){
- driverActivityOnline = new DriverActivityOnline();
- driverActivityOnline.setInsertTime(nowDay);
- }
- driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
- driverActivityOnline.setDriverActivityId(driverActivity.getId());
- driverActivityOnline.setStartTime(startTimes);
- driverActivityOnline.setEndTime(endTimes);
- driverActivityOnline.setType(2);
- driverActivityOnline.setOnline(num6);
- driverActivityOnline.setMoney(num7);
- driverActivityOnline.insertOrUpdate();
+// driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",2));
+// if(driverActivityOnline==null){
+// driverActivityOnline = new DriverActivityOnline();
+// driverActivityOnline.setInsertTime(nowDay);
+// }
+// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+// driverActivityOnline.setDriverActivityId(driverActivity.getId());
+// driverActivityOnline.setStartTime(startTimes);
+// driverActivityOnline.setEndTime(endTimes);
+// driverActivityOnline.setType(2);
+// driverActivityOnline.setOnline(num6);
+// driverActivityOnline.setMoney(num7);
+// driverActivityOnline.insertOrUpdate();
//添加在线活动-城际
driverActivityOnline =driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",3));
if(driverActivityOnline==null){
--
Gitblit v1.7.1