From e24375b5bde4ddfb55a520f104fb6136e456522e Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 17 十月 2023 18:35:21 +0800
Subject: [PATCH] #车型序号内置

---
 server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 2b0c3d3..2d6f01c 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
@@ -221,6 +221,8 @@
         queryWrapper.le(model.getRentDateEnd()!=null, MemberRides::getRentDate,model.getRentDateEnd());
         queryWrapper.eq(model.getCloseStatus()!=null,MemberRides::getCloseStatus, model.getCloseStatus());
         queryWrapper.eq(model.getGoodsorderId()!=null,MemberRides::getOrdreId, model.getGoodsorderId());
+        queryWrapper.in(MemberRides::getStatus,
+                Arrays.asList(Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()));
         queryWrapper
                 .selectAs(MemberRides::getId,MemberRidesDTO::getId)
                 .selectAs(Member::getOpenid,MemberRidesDTO::getOpenid)
@@ -232,7 +234,9 @@
                 .selectAs(MemberRides::getRentDate,MemberRidesDTO::getRentDate)
                 .selectAs(MemberRides::getRentLockId,MemberRidesDTO::getRentLockId)
                 .selectAs(MemberRides::getRentSiteId,MemberRidesDTO::getRentSiteId)
-                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate);
+                .selectAs(MemberRides::getBackDate,MemberRidesDTO::getBackDate)
+                .selectAs(MemberRides::getBackSiteId,MemberRidesDTO::getBackSiteId)
+                .selectAs(MemberRides::getBackLockId,MemberRidesDTO::getBackLockId);
         return queryWrapper;
     }
 

--
Gitblit v1.9.3