From 831e3312572cf29dd91cbd882ef3dce809ac852d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:58:04 +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 | 7 +++++++
1 files changed, 7 insertions(+), 0 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 9cf7a88..ab2841e 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
@@ -203,4 +203,11 @@
* 主动完成线下收款
*/
void completeCollection();
+
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, String merOrderId, Double amount, Integer sourceType);
+
+
+
+ void saveRevenue(Order order) throws Exception;
}
--
Gitblit v1.7.1