From f9fff682ff6b21344401bb86f85d25c97c37b073 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 22 七月 2024 17:01:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java | 107 ++++++++++++++++++++++++++++-------------------------
1 files changed, 56 insertions(+), 51 deletions(-)
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 06d4769..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
@@ -52,7 +52,10 @@
}
@Override
- public void insertOrUpdate(Integer id, String staTime, String startTime, String num1, Double num2, Double num3, Integer num4, Double num5, Integer num6, Double num7, Integer num8, Double num9, Integer num10, Double num11) {
+ public void insertOrUpdate(Integer id, String staTime, String startTime,
+ String num1, Double num2, Double num3, Integer num4,
+ Double num5, Integer num6, Double num7, Integer num8,
+ Double num9, Integer num10, Double num11,String num12) {
//判断id是否为空，为空执行添加，或者执行修改
if(id==null){
String[] timeArray = startTime.split(" - ");
@@ -80,29 +83,30 @@
driverActivityOnline.setType(1);
driverActivityOnline.setOnline(num4);
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
driverActivityOnline.insertOrUpdate();
- //添加在线活动-出租车
- driverActivityOnline = new DriverActivityOnline();
- driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
- driverActivityOnline.setDriverActivityId(driverActivity.getId());
- driverActivityOnline.setStartTime(startTimes);
- driverActivityOnline.setEndTime(endTimes);
- driverActivityOnline.setInsertTime(nowDay);
- driverActivityOnline.setType(2);
- driverActivityOnline.setOnline(num6);
- driverActivityOnline.setMoney(num7);
- driverActivityOnline.insertOrUpdate();
- //添加在线活动-城际
- driverActivityOnline = new DriverActivityOnline();
- driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
- driverActivityOnline.setDriverActivityId(driverActivity.getId());
- driverActivityOnline.setStartTime(startTimes);
- driverActivityOnline.setEndTime(endTimes);
- driverActivityOnline.setInsertTime(nowDay);
- driverActivityOnline.setType(3);
- driverActivityOnline.setOnline(num8);
- driverActivityOnline.setMoney(num9);
- driverActivityOnline.insertOrUpdate();
+// //添加在线活动-出租车
+// driverActivityOnline = new DriverActivityOnline();
+// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+// driverActivityOnline.setDriverActivityId(driverActivity.getId());
+// driverActivityOnline.setStartTime(startTimes);
+// driverActivityOnline.setEndTime(endTimes);
+// driverActivityOnline.setInsertTime(nowDay);
+// driverActivityOnline.setType(2);
+// driverActivityOnline.setOnline(num6);
+// driverActivityOnline.setMoney(num7);
+// driverActivityOnline.insertOrUpdate();
+// //添加在线活动-城际
+// driverActivityOnline = new DriverActivityOnline();
+// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+// driverActivityOnline.setDriverActivityId(driverActivity.getId());
+// driverActivityOnline.setStartTime(startTimes);
+// driverActivityOnline.setEndTime(endTimes);
+// driverActivityOnline.setInsertTime(nowDay);
+// driverActivityOnline.setType(3);
+// driverActivityOnline.setOnline(num8);
+// driverActivityOnline.setMoney(num9);
+// driverActivityOnline.insertOrUpdate();
//添加订单活动
DriverActivityOrder driverActivityOrder = new DriverActivityOrder();
driverActivityOrder.setCompanyId(driverActivity.getCompanyId());
@@ -151,8 +155,8 @@
driverActivity.setName(num1);
driverActivity.setStartTime(startTimes);
driverActivity.setEndTime(endTimes);
- driverActivity.insertOrUpdate();
+ driverActivity.insertOrUpdate();
//添加在线活动-专车
DriverActivityOnline driverActivityOnline = driverActivityOnlineService.selectOne(new EntityWrapper<DriverActivityOnline>().eq("driverActivityId",id).eq("type",1));
if(driverActivityOnline==null){
@@ -166,35 +170,36 @@
driverActivityOnline.setType(1);
driverActivityOnline.setOnline(num4);
driverActivityOnline.setMoney(num5);
+ driverActivityOnline.setOfflineTime(Double.valueOf(num12));
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){
- driverActivityOnline = new DriverActivityOnline();
- driverActivityOnline.setInsertTime(nowDay);
- }
- driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
- driverActivityOnline.setDriverActivityId(driverActivity.getId());
- driverActivityOnline.setStartTime(startTimes);
- driverActivityOnline.setEndTime(endTimes);
- driverActivityOnline.setType(3);
- driverActivityOnline.setOnline(num8);
- driverActivityOnline.setMoney(num9);
- 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){
+// driverActivityOnline = new DriverActivityOnline();
+// driverActivityOnline.setInsertTime(nowDay);
+// }
+// driverActivityOnline.setCompanyId(driverActivity.getCompanyId());
+// driverActivityOnline.setDriverActivityId(driverActivity.getId());
+// driverActivityOnline.setStartTime(startTimes);
+// driverActivityOnline.setEndTime(endTimes);
+// driverActivityOnline.setType(3);
+// driverActivityOnline.setOnline(num8);
+// driverActivityOnline.setMoney(num9);
+// driverActivityOnline.insertOrUpdate();
//添加订单活动
DriverActivityOrder driverActivityOrder = driverActivityOrderService.selectOne(new EntityWrapper<DriverActivityOrder>().eq("driverActivityId",id));
if(driverActivityOrder==null){
--
Gitblit v1.7.1