From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 22 七月 2024 17:19:09 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverActivityServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 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){

--
Gitblit v1.7.1