From 548bead175143ab846aaf0816f2ff1129050e94a Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Mon, 21 Jul 2025 16:20:40 +0800
Subject: [PATCH] Merge branch 'master' into xin
---
oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java b/oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java
index 9ba9d0a..aac7c8a 100644
--- a/oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java
+++ b/oying-system/src/main/java/com/oying/modules/rider/service/RiderOrderRecordService.java
@@ -2,13 +2,17 @@
import com.oying.modules.rider.domain.RiderOrderRecord;
import com.oying.modules.rider.domain.dto.RiderOrderRecordQueryCriteria;
+
+import java.text.ParseException;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.oying.modules.rider.domain.vo.OrderRiderOperationVo;
import com.oying.utils.PageResult;
import com.oying.utils.R;
+import org.springframework.transaction.annotation.Transactional;
/**
* @description 服务接口
@@ -58,6 +62,7 @@
*/
void download(List<RiderOrderRecord> all, HttpServletResponse response) throws IOException;
+
/**
* 骑手接单
* @param orderNum
@@ -71,4 +76,33 @@
* @throws IOException /
*/
R riderCancelOrder(String orderNum);
+
+ /**
+ * 修改骑手端订单状态
+ * @param orderNum
+ * @throws IOException /
+ */
+ void updateRiderOrderStatus(String orderNum, String orderStatus);
+
+ /**
+ * 骑手订单状态修改
+ * @param orderRiderOperation
+ * @throws IOException /
+ */
+ R riderOperationOrder(OrderRiderOperationVo orderRiderOperation);
+
+ /**
+ * 骑手完成订单状态
+ * @param orderNum
+ * @throws IOException /
+ */
+ R riderCompleteOrder(String orderNum);
+
+ /**
+ * 骑手完成订单修改接口
+ * @param orderNum
+ * @param
+ * @throws IOException /
+ */
+ void updateRiderOrderInfo(String orderNum) ;
}
--
Gitblit v1.9.3