From 1147614053efae0314a36c15293a6a5ed4e6d737 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 21 二月 2025 11:28:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/services/src/main/java/com/doumee/service/business/impl/MemberRidesServiceImpl.java | 9 +++++++--
1 files changed, 7 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 9967282..9608680 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
@@ -497,6 +497,7 @@
Goodsorder goodsorder = goodsorderService.findOneByWrapper(new QueryWrapper<Goodsorder>()
.eq("isdeleted", Constants.ZERO)
.eq("status", Constants.goodsorderStatus.pay)
+ .eq("type", Constants.ZERO)
.eq("member_id", memberId)
.orderByDesc("create_date")
.last("limit 1"));
@@ -708,8 +709,9 @@
}
Integer bikeType = Constants.ZERO;
//鏍规嵁鍓嶇紑鍖哄垎鏄惁涓虹數杞︿簩缁寸爜
- if(code.startsWith(systemDictDataBiz.queryByCode(Constants.MINI_PROGRAMME,Constants.ELECTRICITY_PREFIX).getCode())){
+ if(code.startsWith(Constants.EBIKE_PREFIX)){
bikeType = Constants.ONE;
+ code = code.replaceFirst(Constants.EBIKE_PREFIX,"");
}
MemberRidesResponse memberRidesResponse = new MemberRidesResponse();
Bikes bike= new Bikes();
@@ -768,9 +770,10 @@
if(Objects.isNull(baseParam)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"褰撳墠杞﹁締绫诲瀷鏃犳硶绉熻祦锛岃鑱旂郴绠＄悊鍛橈紒");
}
+ memberRidesResponse.setBikeCode(bike.getCode());
+ memberRidesResponse.setBikeTypeName(baseParam.getName());
MemberRides memberRides = new MemberRides();
this.dealMemberRidesData(baseParam.getId(),memberRides);
- memberRidesResponse.setBikeCode(memberRides.getBikeCode());
memberRidesResponse.setBasePrice(memberRides.getBasePrice());
memberRidesResponse.setBaseTime(memberRides.getBaseTime());
memberRidesResponse.setUnitTime(memberRides.getUnitTime());
@@ -779,6 +782,8 @@
memberRidesResponse.getBasePrice(),memberRidesResponse.getBaseTime(),
memberRidesResponse.getUnitPrice()
,memberRidesResponse.getUnitTime()));
+ //鏌ヨ褰撳墠鐨勯獞琛屽椁�
+ memberRidesResponse.setDiscountMember(goodsorderService.getUseDiscount(memberId,Constants.ZERO));
return memberRidesResponse;
}
--
Gitblit v1.9.3