From 2ab5f166d0fad4b1a860fde3bab1adb46d062c3f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 23 七月 2025 21:18:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 7b0b63f..f0b5ae9 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -80,7 +80,71 @@
<sql id="Base_Column_List">
id, type, userId, driverId, carId, orderNum, placementLon, placementLat, placementAddress, startLon, startLat, endLon, startAddress, endLat, endAddress, boardingLon, boardingLat, boardingAddress, boardingTime, getoffLon, getoffLat, getoffAddress, getoffTime, mileage, payManner, payType, orderMoney, startMoney, mileageMoney, durationMoney, longDistanceMoney, parkMoney, roadTollMoney, redPacketMoney, couponMoney, redPacketId, couponId, discount, discountMoney, activityId, companyId, payMoney, substitute, passengers, passengersPhone, state, insertTime, travelTime, snatchOrderTime, setOutTime, arriveTime, startServiceTime, endServiceTime, orderType, orderSource, invoiceId, isReassign, reassignNotice, trackId, isDelete, oldState, telX, bindId, serverCarModelId
</sql>
-
+ <select id="getPrivateCarOrderListExport" resultType="java.util.Map">
+ SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
+ sc.`name` as serverCarModelName,ot.* FROM t_order_private_car as ot
+ LEFT JOIN t_user as ui on ui.id = ot.userId
+ LEFT JOIN t_driver as di on di.id = ot.driverId
+ LEFT JOIN t_car as ci on ci.id= ot.carId
+ LEFT JOIN t_car_brand as cb on cb.id = ci.carBrandId
+ LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
+ ) as o
+ <where>
+ o.isDelete = 1
+ <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
+ AND (o.insertTime between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ </if>
+ <if test="orderNum != null and orderNum != ''">
+ and o.orderNum LIKE CONCAT('%',#{orderNum},'%')
+ </if>
+ <if test="orderSource != null and orderSource != ''">
+ and o.orderSource = #{orderSource}
+ </if>
+ <if test="userName != null and userName != ''">
+ and o.userName LIKE CONCAT('%',#{userName},'%')
+ </if>
+ <if test="userPhone != null and userPhone != ''">
+ and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ </if>
+ <if test="passengers != null and passengers != ''">
+ and o.passengers LIKE CONCAT('%',#{passengers},'%')
+ </if>
+ <if test="passengersPhone != null and passengersPhone != ''">
+ and o.passengersPhone LIKE CONCAT('%',#{passengersPhone},'%')
+ </if>
+ <if test="serverCarModelId != null and serverCarModelId != ''">
+ and o.serverCarModelId = #{serverCarModelId}
+ </if>
+ <if test="driver != null and driver != ''">
+ and o.driver LIKE CONCAT('%',#{driver},'%')
+ </if>
+ <if test="state != null and state != ''">
+ and o.state = #{state}
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 2">
+ and (o.companyId = #{nowUserId} or FIND_IN_SET(o.companyId,(SELECT GROUP_CONCAT(id) as ids FROM t_company where superiorId = #{nowUserId} GROUP BY superiorId)))
+ </if>
+ <if test="roleType != null and roleType != '' and roleType == 3">
+ and o.companyId = #{nowUserId}
+ </if>
+ <if test="null != rideType">
+ and o.rideType = #{rideType}
+ </if>
+ <if test="null != abnormal">
+ and o.abnormal = #{abnormal}
+ </if>
+ <if test="null != promotion">
+ and o.promotion = #{promotion}
+ </if>
+ <if test="null != promotionUser and promotionUser!='' ">
+ and o.promotionUser =#{promotionUser}
+ </if>
+ <if test="null != abnormalStatus">
+ and o.abnormalStatus = #{abnormalStatus}
+ </if>
+ </where>
+ order by o.id desc
+ </select>
<!--根据条件查询快车订单列表-->
<select id="getPrivateCarOrderList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
SELECT * FROM (SELECT ui.nickName as userName,ui.phone as userPhone,CONCAT(di.`name`,'-',di.phone) as driver,CONCAT(cb.`name`,'-',ci.carLicensePlate) as car,
@@ -132,6 +196,18 @@
<if test="null != rideType">
and o.rideType = #{rideType}
</if>
+ <if test="null != abnormal">
+ and o.abnormal = #{abnormal}
+ </if>
+ <if test="null != promotion">
+ and o.promotion = #{promotion}
+ </if>
+ <if test="null != promotionUser and promotionUser!='' ">
+ and o.promotionUser =#{promotionUser}
+ </if>
+ <if test="null != abnormalStatus">
+ and o.abnormalStatus = #{abnormalStatus}
+ </if>
</where>
order by o.id desc
</select>
@@ -151,7 +227,9 @@
ui.nickName as userName,ui.phone as userPhone,
case when ot.payType = 1 then '微信'
when ot.payType = 2 then '支付宝'
- when ot.payType = 3 then '余额' else '云闪付' end as payTypeStr,
+ when ot.payType = 3 then '余额'
+ when ot.payType = 4 then '云闪付'
+ else '预备金' end as payTypeStr,
sc.`name` as serverCarModel,
case when income1.type = 1 then income1.money else 0 end as platIncome,
case when income1.type = 2 then income1.money else 0 end as companyIncome,
@@ -180,4 +258,5 @@
UNION ALL
SELECT IFNULL(amount,0) amount,b.`name` FROM t_order_additional_fee a LEFT JOIN t_additional_fee b ON a.additionalFeeId=b.id WHERE a.orderId=#{id} AND a.orderType=#{orderType} AND a.id>1 AND amount>0
</select>
+
</mapper>
--
Gitblit v1.7.1