From c6328c058f904ac142d00ce83a7afeecb5adf213 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 19 十月 2023 14:50:04 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/core/utils/DateUtil.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index fdee4ed..1baf3ea 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3017,7 +3017,7 @@
long createTime =begin.getTime();//鑾峰彇鍒涘缓鏃堕棿鐨勬椂闂存埑
long currentTime =Objects.isNull(end)?System.currentTimeMillis():end.getTime();//鑾峰彇褰撳墠鏃堕棿鐨勬椂闂存埑
long diff=(currentTime-createTime)/1000/60;//鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勫垎閽�
- return (int)diff;
+ return (int)diff + 1 ;
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
index 302ef01..7b5e80d 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java
@@ -357,7 +357,7 @@
Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
//璁＄畻楠戣璁¤垂鏃堕暱
- update.setDuration( freeRentTime > rideTime ? 0 : rideTime);
+ update.setDuration( rideTime > freeRentTime ? rideTime : 0 );
//update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
memberRidesMapper.updateById(update);
//淇敼鍓�
--
Gitblit v1.9.3