From 0046d701fb2878895359b0ffe7a5354c4ccab7e4 Mon Sep 17 00:00:00 2001
From: Mr.Zhang <710666463@qq.com>
Date: 星期三, 18 十月 2023 16:07:09 +0800
Subject: [PATCH] 管理端
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 7 +++++--
1 files changed, 5 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 51a5e59..349f663 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
@@ -220,8 +220,9 @@
queryWrapper.ge(model.getRentDateStart()!=null, MemberRides::getRentDate,model.getRentDateStart());
queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
+ queryWrapper.eq(model.getStatus()!=null,MemberRides::getStatus, model.getStatus());
queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
- queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
+// queryWrapper.eq(MemberRides::getBackType, Constants.ZERO);
queryWrapper.in(MemberRides::getStatus,
Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
queryWrapper
@@ -727,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("鐢ㄦ埛姝ｅ父杩樿溅");
--
Gitblit v1.9.3