From 973ebbb2da517ad0f6e37495654a5b0a67f9946e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 18 十月 2023 15:47:17 +0800
Subject: [PATCH] bug
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 3 ++-
server/platform/src/main/resources/application.yml | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/server/platform/src/main/resources/application.yml b/server/platform/src/main/resources/application.yml
index 7a60062..82e580e 100644
--- a/server/platform/src/main/resources/application.yml
+++ b/server/platform/src/main/resources/application.yml
@@ -63,4 +63,3 @@
mqtt:
clientid: doumeetestplat
subclientid: doumeetestplatSub
-
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..bfff9c9 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
--
Gitblit v1.9.3