From 5cb1979f05446792cc33a8cb6b7aaae906da5a70 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 16 八月 2023 09:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
index 0cdd764..e6578dd 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java
@@ -5,6 +5,7 @@
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.warpper.*;
+import java.util.HashMap;
import java.util.List;
/**
@@ -77,7 +78,7 @@
* @return
* @throws Exception
*/
- ResultUtil<List<String>> queryDriverPosition(Integer uid) throws Exception;
+ ResultUtil<HashMap<String, Object>> queryDriverPosition(Integer uid) throws Exception;
/**
@@ -131,6 +132,17 @@
ResultUtil balanceRecharge(Integer uid, Double amount) throws Exception;
+
+ /**
+ * 司机账户余额充值
+ * @param driverId
+ * @param amount
+ * @return
+ * @throws Exception
+ */
+ ResultUtil balanceRecharge1(Integer driverId, String jscode, Double amount) throws Exception;
+
+
/**
* 支付回调通知处理
* @param out_trade_no
@@ -177,13 +189,8 @@
ResultUtil closeOrderQRCode(Integer uid) throws Exception;
- /**
- * 开通小微商户
- * @param name
- * @param number
- * @param phone
- * @return
- * @throws Exception
- */
- ResultUtil microenterprise(Integer uid, String name, String number, String phone) throws Exception;
+
+ ResultUtil<HashMap<String, Object>> queryDriverOrderNum(String time,Integer uid);
+
+ ResultUtil microenterprise(Integer uid, String name, String number, String phone, String notifyUrl) throws Exception;
}
--
Gitblit v1.7.1