From 43119e9cac4750e2dddb2e19c2c5e2eb46ae05ca Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 十月 2023 14:04:36 +0800
Subject: [PATCH] 修復bug

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

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 bfff9c9..781768b 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
@@ -273,7 +273,7 @@
             throw  new BusinessException( ResponseStatus.DATA_EMPTY );
         }
         if(Constants.formatIntegerNum(model.getStatus()) != Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()||
-        Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ONE){
+        Constants.formatIntegerNum(model.getCloseStatus()) != Constants.ZERO){
             throw  new BusinessException( ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝鍙兘閽堝宸茶繕杞︿笖鏈粨绠楃殑鏁版嵁杩涜鎿嶄綔锛�" );
         }
         if(Constants.formatIntegerNum(memberRides.getDuration()) == Constants.formatIntegerNum(model.getDuration())){
@@ -728,7 +728,9 @@
         update.setBackLockId(param.getBackLockId());
         update.setBackSiteId(param.getBackSiteId());
         update.setBackCommondId(param.getBackCommondId());
-        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+//        int duration =DateUtil.betweenMin(memberRides.getRentDate(),date)-freeTime;
+        int min = DateUtil.betweenMin(memberRides.getRentDate(),date);//瀹為檯楠戣鏃堕棿
+        int duration = min>freeTime?min:0;
         update.setDuration(duration>0?duration:0);
         update.setBackType(Constants.ONE);
         update.setBackInfo("鐢ㄦ埛姝e父杩樿溅");

--
Gitblit v1.9.3