From 78851285202a040f8ddf998c067cd462874c1cb9 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 19 十月 2023 14:55:27 +0800
Subject: [PATCH] 配置修改
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
index 5a6cec0..f633bbd 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml
@@ -37,7 +37,6 @@
<result column="parkMoney" property="parkMoney"/>
<result column="roadTollMoney" property="roadTollMoney"/>
<result column="tipMoney" property="tipMoney"/>
- <result column="holidayFee" property="holidayFee"/>
<result column="redPacketMoney" property="redPacketMoney"/>
<result column="couponMoney" property="couponMoney"/>
<result column="redPacketId" property="redPacketId"/>
@@ -47,7 +46,6 @@
<result column="activityId" property="activityId"/>
<result column="companyId" property="companyId"/>
<result column="payMoney" property="payMoney"/>
- <result column="thankYouFee" property="thankYouFee"/>
<result column="substitute" property="substitute"/>
<result column="passengers" property="passengers"/>
<result column="passengersPhone" property="passengersPhone"/>
@@ -61,6 +59,7 @@
<result column="endServiceTime" property="endServiceTime"/>
<result column="orderType" property="orderType"/>
<result column="orderSource" property="orderSource"/>
+ <result column="deviceCode" property="deviceCode"/>
<result column="invoiceId" property="invoiceId"/>
<result column="isReassign" property="isReassign"/>
<result column="reassignNotice" property="reassignNotice"/>
@@ -276,13 +275,13 @@
a.endLat as endLat,
a.orderMoney as orderMoney,
a.payManner as payManner,
- a.thankYouFee,
a.trackId as trackId,
b.nickName as nickName,
a.passengersPhone as phone,
a.orderType as reservation,
a.telX as telX,
a.bindId as bindId,
+ a.orderSource as orderSource,
(
(select count(id) from t_order_private_car where userId = b.id and state in (8, 9)) +
(select count(id) from t_order_taxi where userId = b.id and state in (8, 9)) +
--
Gitblit v1.7.1