From b2eda32b99ddc336372f1cd601d4df23d5f729a8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 13 三月 2023 18:10:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IDriverService.java |   62 +++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 4 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 8316f97..de7a610 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
@@ -3,10 +3,10 @@
 import com.baomidou.mybatisplus.service.IService;
 import com.supersavedriving.driver.modular.system.model.Driver;
 import com.supersavedriving.driver.modular.system.util.ResultUtil;
-import com.supersavedriving.driver.modular.system.warpper.DriverRegisterWarpper;
-import com.supersavedriving.driver.modular.system.warpper.TokenWarpper;
+import com.supersavedriving.driver.modular.system.warpper.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
 * 司机
@@ -37,6 +37,17 @@
 
 
     /**
+     * 司机密码登录
+     * @param receiver  国家代码+86
+     * @param phone     手机号
+     * @param password  密码
+     * @return
+     * @throws Exception
+     */
+    ResultUtil<TokenWarpper> driverPassLogin(String receiver, String phone, String password) throws Exception;
+
+
+    /**
      * 刷新token
      * @param uid
      * @return
@@ -47,10 +58,9 @@
 
     /**
      * 校验token获取用户信息
-     * @param request
      * @return
      */
-    Integer getUserByRequset(HttpServletRequest request) throws Exception;
+    Integer getUserByRequest() throws Exception;
 
 
     /**
@@ -60,4 +70,48 @@
      * @throws Exception
      */
     void setPassword(Integer uid, String password) throws Exception;
+
+
+    /**
+     * 获取5公里范围内的司机坐标
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    ResultUtil<List<String>> queryDriverPosition(Integer uid) throws Exception;
+
+
+    /**
+     * 存储司机实时位置
+     * @throws Exception
+     */
+    void addDriverPosition(DriverPositionWarpper driverPositionWarpper) throws Exception;
+
+
+    /**
+     * 获取分享二维码数据
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    PromotionWarpper queryPromotionQRCode(Integer uid) throws Exception;
+
+
+    /**
+     * 获取司机个人信息
+     * @param uid
+     * @return
+     * @throws Exception
+     */
+    DriverInfoWarpper queryDriverInfo(Integer uid) throws Exception;
+
+
+    /**
+     * 修改个人信息
+     * @param uid
+     * @param driverInfo
+     * @return
+     * @throws Exception
+     */
+    ResultUtil saveDriverInfo(Integer uid, DriverInfo driverInfo) throws Exception;
 }

--
Gitblit v1.7.1