From f664bea25bee4609721dd8fbbcc0205878772d9a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 二月 2023 16:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/ITDriverService.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 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 8da146e..7303cfc 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
@@ -2,6 +2,7 @@
 
 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;
@@ -53,7 +54,7 @@
      * 新增修改处理数据
      * @param tDriver
      */
-    void addOrUpdate(TDriver tDriver);
+    Object addOrUpdate(TDriver tDriver);
 
     /**
      * 查询佣金列表
@@ -64,4 +65,17 @@
      */
     EntityWrapper<TDriver> getCommissionPageList(String name, String phone, Integer status);
 
+    /**
+     * 封装佣金集合
+     * @param list
+     * @return
+     */
+    List<TDriverCommissionResp> getTDriverCommissionResp(List<TDriver> list);
+
+    /**
+     * 佣金详情
+     * @param tDriverId
+     * @param model
+     */
+    void driverCommissionDetail(Integer tDriverId, Model model);
 }

--
Gitblit v1.7.1