From e0d15a5f7ba69891cf9437b9e823e3a4087f2d35 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 17:45:54 +0800
Subject: [PATCH] 2.0新增
---
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml | 4 +++-
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml | 4 +++-
ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html | 1 +
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 6 ++++++
ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java | 6 ++++++
5 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index bf98a4a..b64a4ec 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1901,6 +1901,7 @@
shellList.add("服务模式");
shellList.add("关联线路");
shellList.add("评分");
+ shellList.add("邀请次数");
shellList.add("历史接单数");
shellList.add("历史订单总金额");
shellList.add("当前钱包余额");
@@ -1968,6 +1969,11 @@
}else{
shellList.add("0");
}
+ if(SinataUtil.isNotEmpty(object.get("inviteNumber"))){
+ shellList.add(object.get("inviteNumber").toString());
+ }else{
+ shellList.add("0");
+ }
if(SinataUtil.isNotEmpty(object.get("historyNum"))){
shellList.add(object.get("historyNum").toString());
}else{
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
index 23c31c9..e9b1647 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TUserController.java
@@ -544,6 +544,7 @@
shellList.add("紧急联系人电话");
shellList.add("是否实名认证");
shellList.add("历史出行次数");
+ shellList.add("邀请次数");
shellList.add("历史消费");
shellList.add("积分");
shellList.add("备注");
@@ -594,6 +595,11 @@
}else{
shellList.add("-");
}
+ if(SinataUtil.isNotEmpty(object.get("inviteNumber"))){
+ shellList.add(object.get("inviteNumber").toString());
+ }else{
+ shellList.add("0");
+ }
if(SinataUtil.isNotEmpty(object.get("consumptionNum"))){
shellList.add(object.get("consumptionNum").toString());
}else{
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
index c8859c3..6d534c0 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TDriverMapper.xml
@@ -272,7 +272,7 @@
<!--根据审核通过的司机列表无分页-->
<select id="getDriverListNoPage" resultType="map">
SELECT * FROM (SELECT cc1.`name` as companyName,cc2.`name` as franchiseeName,ci.carLicensePlate,ds.serverStr,IFNULL(oe.evaluateNum,0) as evaluateNum,
- (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0)) as historyNum,(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0)) as historyMoney,dd.* from t_driver as dd
+ (IFNULL(ot1.taxiNum, 0) + IFNULL(ot3.num, 0) + IFNULL(ot5.num, 0)) as historyNum,(IFNULL(ot2.taxiMoney, 0)+ IFNULL(ot4.money, 0) + IFNULL(ot6.money, 0)) as historyMoney,ti.inviteNumber,dd.* from t_driver as dd
LEFT JOIN (select * from t_company where type = 2 and flag != 3) as cc1 on cc1.id = dd.companyId
LEFT JOIN (select * from t_company where type = 3 and flag != 3) as cc2 on cc2.id = dd.franchiseeId
LEFT JOIN (select * from t_car where state = 1) as ci on ci.id = dd.carId
@@ -292,6 +292,8 @@
LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_private_car where FIND_IN_SET(state,'7,8,9') GROUP BY driverId) as ot4 on ot4.driverId = dd.id
LEFT JOIN (SELECT COUNT(id) as num,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot5 on ot5.driverId = dd.id
LEFT JOIN (SELECT SUM(orderMoney) as money,driverId FROM t_order_cross_city where FIND_IN_SET(state,'6,7,8') GROUP BY driverId) as ot6 on ot6.driverId = dd.id
+ LEFT JOIN (select COUNT(id) as inviteNumber,inviteUserId from t_invite where userType =2 GROUP BY inviteUserId)as ti on ti.inviteUserId = dd.id
+
) as o
<where>
o.flag != 3
diff --git a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
index 284b1a6..b08b7e9 100644
--- a/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
+++ b/ManagementOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TUserMapper.xml
@@ -99,10 +99,12 @@
<!--根据条件查询用户列表-无分页-->
<select id="getUserListNoPage" resultType="map" >
- SELECT * FROM (SELECT ci.`name` as companyName,IFNULL(ot.num,0) as historyNum,IFNULL(td.num,0) as consumptionNum,ui.* from t_user as ui
+ SELECT * FROM (SELECT ci.`name` as companyName,IFNULL(ot.num,0) as historyNum,IFNULL(td.num,0) as consumptionNum,ti.inviteNumber,ui.* from t_user as ui
LEFT JOIN (select * from t_company where flag != 3) as ci on ci.id = ui.companyId
LEFT JOIN (SELECT COUNT(id) as num,userId from t_order_taxi where FIND_IN_SET(state,'8,9') GROUP BY userId) as ot on ot.userId = ui.id
LEFT JOIN (SELECT sum(money) as num,userId from t_pub_transaction_details where userType = 1 and type = 1 and state = 2 GROUP BY userId) as td on td.userId = ui.id
+ LEFT JOIN (select COUNT(id) as inviteNumber,inviteUserId from t_invite where userType =1 GROUP BY inviteUserId)as ti on ti.inviteUserId = ui.id
+
) as o
<where>
o.flag != 3
diff --git a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
index 94c1f19..fc1e318 100644
--- a/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
+++ b/ManagementOKTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tOrderTaxi/tOrderTaxi_edit.html
@@ -79,6 +79,7 @@
<#label id="companyMoney" name="远途费" value="${item.longDistanceMoney}"/>
<#label id="companyMoney" name="过路费" value="${item.roadTollMoney}"/>
<#label id="companyMoney" name="停车费" value="${item.parkMoney}"/>
+ <#label id="companyMoney" name="优惠券抵扣" value="${item.couponMoney}"/>
<#label id="companyMoney" name="平台抽成" value="${companyMoney}"/>
</div>
--
Gitblit v1.7.1