From 687d0fc2de844e09864cc2ea2b24550069a50546 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 26 十月 2023 16:00:38 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java index 7f6f0be..189e8c6 100644 --- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java +++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java @@ -659,6 +659,7 @@ .selectAs(BaseParam::getName,MemberRides::getParamName) .leftJoin(BaseParam.class,BaseParam::getId,MemberRides::getParamId) .eq(MemberRides::getOrdreId,id) + .in(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.RIDES_RUNNING.getKey(),Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey()) .orderByDesc(MemberRides::getCreateDate)); if (!CollectionUtils.isEmpty(memberRides)){ //棰勮缁撶畻浠锋牸鍜岃绠楁椂闀� -- Gitblit v1.9.3