From 3b48dbfe08bf2bcaeba2f8f9ff63f1599407fcdd Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 23 十月 2023 14:53:29 +0800
Subject: [PATCH] #调整记录修改单位

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |    5 +++--
 1 files changed, 3 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 20a3f3c..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
@@ -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())){
@@ -357,7 +357,8 @@
         Integer freeRentTime = Integer.valueOf(collect.get(Constants.FREE_RENT_TIME).getCode());
         Integer rideTime = DateUtil.betweenMin(model.getRentDate(), update.getBackDate());
         //璁$畻楠戣璁¤垂鏃堕暱
-        update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
+        update.setDuration( rideTime > freeRentTime  ? rideTime : 0 );
+        //update.setDuration( freeRentTime > 0 ? rideTime - freeRentTime : rideTime);
         memberRidesMapper.updateById(update);
         //淇敼鍓�
         String beforeContent = JSONObject.toJSONString(model);

--
Gitblit v1.9.3