From 0481353111afb43a2322e18530dde26f1d841ead Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:15:34 +0800
Subject: [PATCH] 代码调整
---
ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 21 +++------------------
1 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index aed80a9..ac20118 100644
--- a/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -68,12 +68,6 @@
<result column="telX" property="telX" />
<result column="bindId" property="bindId" />
<result column="serverCarModelId" property="serverCarModelId" />
- <result column="peopleNum" property="peopleNum" />
- <result column="rideType" property="rideType" />
- <result column="pid" property="pid" />
- <result column="totalPeopleNum" property="totalPeopleNum" />
- <result column="estimateMileage" property="estimateMileage" />
- <result column="estimateTime" property="estimateTime" />
</resultMap>
<!-- 通用查询结果列 -->
@@ -81,7 +75,7 @@
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="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,
sc.`name` as serverCarModel,ot.* FROM t_order_private_car as ot
@@ -92,7 +86,7 @@
LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
) as o
<where>
- o.isDelete = 1 and o.type = 1 and o.pid is null
+ o.isDelete = 1 and o.type = 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>
@@ -129,14 +123,11 @@
<if test="roleType != null and roleType != '' and roleType == 3">
and o.companyId = #{nowUserId}
</if>
- <if test="null != rideType">
- and o.rideType = #{rideType}
- </if>
</where>
order by o.id desc
</select>
- <!--根据快车订单ID获取快车订单详情-->
+ <!--根据专车订单ID获取专车订单详情-->
<select id="getPrivateCarOrderDetailById" resultType="map">
SELECT
DATE_FORMAT(ot.insertTime,'%Y-%m-%d %H:%i') as insertTimeStr,
@@ -174,10 +165,4 @@
where ot.id = #{orderId}
</select>
-
- <select id="getSurcharge" resultType="map">
- 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
- 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