From c2298b7feb6c8d968cac3da3e9d3caa56853f648 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 26 五月 2023 15:14:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
index 0da500f..ef3ac5f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java
@@ -1,12 +1,16 @@
package com.stylefeng.guns.modular.system.service;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.stylefeng.guns.modular.system.controller.resp.TDriverCommissionResp;
import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
import com.stylefeng.guns.modular.system.model.TDriver;
import com.baomidou.mybatisplus.service.IService;
import org.springframework.ui.Model;
+import java.io.File;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -42,10 +46,53 @@
void auditPage(Integer id, Model model);
/**
- * 跳转详情页面
+ * 聚合ocr识别
+ * @param file
+ * @return
+ */
+ JSONObject ocr(File file);
+
+ /**
+ * 新增修改处理数据
+ * @param tDriver
+ */
+ Object addOrUpdate(TDriver tDriver);
+
+ /**
+ * 查询佣金列表
+ * @param name
+ * @param phone
+ * @param status
+ * @return
+ */
+ EntityWrapper<TDriver> getCommissionPageList(String name, String phone, Integer status);
+
+ /**
+ * 封装佣金集合
+ * @param list
+ * @return
+ */
+ List<TDriverCommissionResp> getTDriverCommissionResp(List<TDriver> list);
+
+ /**
+ * 佣金详情
* @param tDriverId
* @param model
*/
- void detail(Integer tDriverId, Model model);
+ void driverCommissionDetail(Integer tDriverId,Integer levelFlag, Model model);
+ /**
+ * 统计司机数
+ * @param agentId
+ * @param model
+ */
+ void getDataStatistics(Integer agentId, Model model, Map<String, Object> map);
+
+ /**
+ * 统计司机数
+ * @param ids
+ * @param model
+ * @param map
+ */
+ void getDataStatisticsByIds(List<Integer> ids, Model model, Map<String, Object> map);
}
--
Gitblit v1.7.1