From 81f12646ed78657c1cca899ef7a17b0f3b881037 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 02 十一月 2023 12:00:03 +0800
Subject: [PATCH] 111

---
 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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 4f4850e..b95681a 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,6 +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)
                     .orderByDesc(MemberRides::getCreateDate)
                     .last(" limit 1  "));
             if (!Objects.isNull(memberRides)) {
@@ -554,7 +555,7 @@
         if(canBalance.compareTo(money) >= Constants.ZERO){
             RefundDTO refundDTO = new RefundDTO();
             refundDTO.setOrderId(orderId);
-            refundDTO.setCanBalance(canBalance);
+            refundDTO.setCanBalance(canBalance.multiply(new BigDecimal(100)));
             refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
             refundDTO.setTotalAmount(goodsorder.getMoney());
             refundDTO.setMemberId(goodsorder.getMemberId());

--
Gitblit v1.9.3