From d77aa9268ed02e7bda8a67aab2213e42cb5afcf4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 六月 2023 13:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 e989838..79bd20c 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
@@ -153,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;
/**
@@ -197,4 +197,13 @@
* @throws Exception
*/
List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception;
+
+
+ /**
+ * 主动完成线下收款
+ */
+ void completeCollection();
+
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
}
--
Gitblit v1.7.1