From 0655cf0891c66ed11c72e135b86432cbcaf9959c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 20 七月 2023 15:07:44 +0800
Subject: [PATCH] 修改重复收款和优化计算距离及存储有效位置信息的逻辑
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/service/IOrderService.java | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 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 a205622..99067f6 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
@@ -1,11 +1,16 @@
package com.supersavedriving.driver.modular.system.service;
import com.baomidou.mybatisplus.service.IService;
+import com.supersavedriving.driver.modular.system.warpper.*;
import com.supersavedriving.driver.modular.system.model.Order;
import com.supersavedriving.driver.modular.system.util.ResultUtil;
import com.supersavedriving.driver.modular.system.warpper.*;
+import com.supersavedriving.driver.modular.system.warpper.AddOrderWarpper;
+import com.supersavedriving.driver.modular.system.warpper.HallOrderList;
+import com.supersavedriving.driver.modular.system.warpper.OrderInfoWarpper;
import java.util.List;
+import java.util.Map;
/**
* 订单
@@ -21,7 +26,7 @@
* @return
* @throws Exception
*/
- Long queryDriverServerOrder(Integer uid) throws Exception;
+ Map<String, Object> queryDriverServerOrder(Integer uid) throws Exception;
/**
@@ -33,7 +38,7 @@
*/
ResultUtil driverAddOrder(Integer uid, AddOrderWarpper addOrderWarpper) throws Exception;
-
+ Order getOrderPrice(Integer type, Double distance, Integer waitTime, Order order, String city);
/**
* 获取大厅订单列表
* @param uid
@@ -65,6 +70,14 @@
* @throws Exception
*/
ResultUtil receiveOrder(Integer uid, Long orderId) throws Exception;
+
+
+ /**
+ * 推送服务中的数据
+ * @param orderId
+ */
+ void pushOrderInfo(Long orderId);
+
/**
@@ -148,5 +161,61 @@
* @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;
+
+
+ /**
+ * 获取司机的订单列表
+ * @param driverId
+ * @param state
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ List<DriverOrderListWarpper> queryDriverOrderList(Integer driverId, Integer state, Integer pageNum, Integer pageSize) throws Exception;
+
+
+ /**
+ * 司机邀请列表
+ * @param driverId
+ * @param time
+ * @param pageNum
+ * @param pageSize
+ * @return
+ * @throws Exception
+ */
+ List<InviteListWarpper> queryInviteList(Integer driverId, String time, Integer pageNum, Integer pageSize) throws Exception;
+
+
+ /**
+ * 获取业绩汇总数据
+ * @param driverId
+ * @return
+ * @throws Exception
+ */
+ PerformanceSummaryWarpper queryPerformanceSummary(Integer driverId, Integer type, String time, Integer dayType) throws Exception;
+
+
+ /**
+ * 获取我的业绩
+ * @param driverId
+ * @param time
+ * @return
+ * @throws Exception
+ */
+ List<MyAchievementWarpper> queryMyAchievement(Integer driverId, String time) throws Exception;
+
+
+ /**
+ * 主动完成线下收款
+ */
+ void completeCollection();
+
+
+ ResultUtil fengzhang(Integer userType, Integer id, String merchantNumber, Long orderId, Integer rechargeRecordId, String merOrderId, Double amount, Integer sourceType);
+
+
+
+ void saveRevenue(Order order) throws Exception;
}
--
Gitblit v1.7.1