From 7ece553fd95f30dcfafa66f667ef9d0c064a22e6 Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Sat, 19 Jul 2025 16:27:12 +0800
Subject: [PATCH] Merge branch 'pxb' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/impl/RiderOrderRecordServiceImpl.java | 1 +
oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml | 2 +-
2 files changed, 2 insertions(+), 1 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 716c517..78ac98d 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
@@ -288,6 +288,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public R riderCompleteOrder(String orderNum) {
// 当前订单信息
OrderResponse orderResponse = orderService.getByOrderNum(orderNum);
diff --git a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
index 9442c58..354abbc 100644
--- a/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
+++ b/oying-system/src/main/resources/mapper/rider/RiderOrderRecordMapper.xml
@@ -112,7 +112,7 @@
order by create_time desc
</select>
- <select id="selectRiderInfo" resultMap="BaseResultMap">
+ <select id="selectRiderInfo" resultType="com.oying.modules.rider.domain.RiderOrderRecord">
select record_id recordId ,accept_time as acceptTime, order_time as orderTime
from qs_rider_order_record where order_num = #{orderNum}
</select>
--
Gitblit v1.9.3