From 8405a48c18d35df3a39bdbf1d89635d1983b6828 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 17:05:51 +0800
Subject: [PATCH] 111
---
server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2 +-
2 files changed, 3 insertions(+), 3 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 b95681a..f879d2e 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
@@ -310,7 +310,7 @@
MemberRides memberRides = memberRidesJoinMapper.selectOne(new QueryWrapper<MemberRides>().lambda()
.eq(MemberRides::getMemberId, memberId)
.eq(MemberRides::getOrdreId,goodsorder.getId())
- .ne(MemberRides::getOrdreId,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT)
+ .ne(MemberRides::getStatus,Constants.MEMBER_RIDES_STATUS.LOCKING_DEFEAT.getKey())
.orderByDesc(MemberRides::getCreateDate)
.last(" limit 1 "));
if (!Objects.isNull(memberRides)) {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
index 024712f..ea23ebc 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/PricingDetailServiceImpl.java
@@ -93,9 +93,9 @@
public static String getRoleNameByParam(BigDecimal basePrice, Integer baseTime, BigDecimal unitPrice, Integer unitTime) {
String title = "璁¤垂瑙勫垯锛�";
if(baseTime < 0){
- title = (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
+ title += (basePrice.divide(new BigDecimal(100))).doubleValue()+"鍏冪晠楠戜竴鏁村ぉ";
}else {
- title = "璧锋";
+ title += "璧锋";
int time = baseTime / 60;
int min = baseTime % 60;
if(time > 0){
--
Gitblit v1.9.3