From 4c96a8cf1eabd61c681ac9af538b9812a06f380b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 09 十月 2023 14:47:05 +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 | 5 -----
1 files changed, 0 insertions(+), 5 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 9ad6314..ca87427 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
@@ -350,11 +350,6 @@
.eq(MemberRides::getOrdreId,id);
List<MemberRides> memberRides = memberRidesMapper.selectList(wrapper);
if (!CollectionUtils.isEmpty(memberRides)){
- boolean exitUnBack = memberRides.stream().anyMatch(s -> !Constants.MEMBER_RIDES_STATUS.BACK_CYCLING.getKey().equals(s.getStatus()));
- if (exitUnBack){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璁㈠崟鏈夋湭瀹屾垚鐨勯獞琛岋紝鏃犳硶寮哄埗缁撶畻");
- }
-
PricingRuleDTO pricingRule = pricingRuleService.getPricingRule(memberRides);
RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
List<MemberRidesResponse> collect = memberRides.stream().map(s -> {
--
Gitblit v1.9.3