From 07234fed2dc993366fd4c7673d0e8ada90706bd1 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 15 Sep 2025 11:33:45 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
index 4623ac5..2243add 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java
@@ -136,7 +136,7 @@
LocalDateTime orderLocalTime = LocalDateTime.parse(riderOrderRecord.getOrderTime(), formatter);
Timestamp orderTime = Timestamp.valueOf(orderLocalTime);
// 判断是否超时
- String isOvertime = Constants.IS_OVERTIME_YES;
+ String isOvertime = Constants.IS_OVERTIME_NO;
if (now.after(orderTime)) {
isOvertime = Constants.IS_OVERTIME_YES;
}
@@ -302,7 +302,7 @@
// 返回参数
orderResponse.getOrder().setOrderStatus(OrderStatusEnum.SEVEN.getKey());
// 查询骑手钱包信息
- RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(String.valueOf(order.getRiderId()));
+ RiderWalletInfo riderWalletInfo = riderWalletInfoService.getRiderWalletInfo(order.getRiderId());
// 修改骑手钱包信息 // 骑手总金额添加配送费
riderWalletInfo.setAmount(riderWalletInfo.getAmount().add(order.getSendPrice()));
// 骑手可用余额添加配送费
--
Gitblit v1.9.3