From 8967db4cf4d5e2f16830b499db04e850af61b08d Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期四, 22 二月 2024 10:39:45 +0800
Subject: [PATCH] 2.22
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java | 3 ++-
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index fddfa8d..a54881a 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -375,7 +375,7 @@
settlementRecord.setDriverId(orderLogistics.getDriverId());
settlementRecord.setType(1);
settlementRecord.setPaymentStatus(1);
- settlementRecord.setPayMoney(sum);
+ settlementRecord.setPayMoney(d.doubleValue());
settlementRecord.setInsertTime(new Date());
settlementRecordService.insert(settlementRecord);
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
index 92f8564..adab99c 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java
@@ -289,7 +289,8 @@
endTimes = DateUtil.getDate_str3(timeArray[1]+" 23:59:59");
}
Integer uid = ShiroKit.getUser().getId();
- return userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
+ Map<String, Object> map = userActivityService.queryUserActivityList(uid, startTimes, endTimes, name, status, offset, limit);
+ return map;
}
/**
--
Gitblit v1.7.1