From 26173f341341e360dd55e2739be4686070e7ed9d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:35:11 +0800
Subject: [PATCH] 修改支付
---
driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
index e05ff23..fffe477 100644
--- a/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
+++ b/driver/guns-admin/src/main/java/com/supersavedriving/driver/modular/system/dao/mapping/OrderMapper.xml
@@ -70,8 +70,8 @@
b.avatar,
a.userName,
a.userPhone,
- (select count(1) from t_order where userPhone = a.userPhone and state in (107, 108)) as orderTimes,
- (select count(1) from t_order where userPhone = a.userPhone and state in (301)) as cancelTimes,
+ (select count(1) from t_order where userId = a.userId and state in (107, 108, 109)) as orderTimes,
+ (select count(1) from t_order where userId = a.userId and state in (301)) as cancelTimes,
a.source,
UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
a.startAddress,
@@ -97,8 +97,8 @@
b.avatar,
a.userName,
a.userPhone,
- (select count(1) from t_order where userPhone = a.userPhone and state in (107, 108)) as orderTimes,
- (select count(1) from t_order where userPhone = a.userPhone and state in (301)) as cancelTimes,
+ (select count(1) from t_order where userId = a.userId and state in (107, 108, 109)) as orderTimes,
+ (select count(1) from t_order where userId = a.userId and state in (301)) as cancelTimes,
a.source,
UNIX_TIMESTAMP(a.createTime) * 1000 as createTime,
a.startAddress,
@@ -109,6 +109,7 @@
a.endLng,
a.estimatedPrice,
a.estimatedMileage,
+ a.estimatedTime,
a.startPrice,
a.waitTime,
a.actualMileage,
@@ -190,7 +191,7 @@
count(1) as number
from t_order a
left join t_driver b on (a.driverId = b.id)
- where a.state in (107, 108, 108) and a.`status` = 1
+ where a.state in (107, 108, 109) and a.`status` = 1
<if test="null != dayType and 1 == dayType"><!--天-->
<if test="null != time and '' != time">
and DATE_FORMAT(a.createTime, '%Y年%m月%d日') = #{time}
--
Gitblit v1.7.1