From 5a56fe238e5f51efe5221b5a376f109cda4b4b72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:29:11 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
index 77e1a5a..9cf7a88 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java
@@ -10,6 +10,7 @@
import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import java.util.List;
+import java.util.Map;
/**
* 订单
@@ -25,7 +26,7 @@
* @return
* @throws Exception
*/
- Long queryDriverServerOrder(Integer uid) throws Exception;
+ Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception;
/**
@@ -152,7 +153,7 @@
* @return
* @throws Exception
*/
- ResultUtil setOrderStatus(Integer uid, Long orderId, Integer state) throws Exception;
+ ResultUtil setOrderStatus(Integer uid, Long orderId, Integer payType, Integer state) throws Exception;
/**
@@ -196,4 +197,10 @@
* @throws Exception
*/
List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception;
+
+
+ /**
+ * 主动完成线下收款
+ */
+ void completeCollection();
}
--
Gitblit v1.7.1