From d3c3b84382677bf0c8b703912c19d02b9aa2381a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 08 八月 2023 11:57:41 +0800
Subject: [PATCH] 修改功能和bug

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
index b5fbc23..41da08c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
@@ -60,8 +60,8 @@
         o.id, o.code, o.userId, o.driverId, o.`source`, o.agentId, o.branchOfficeId, o.startTime, o.startAddress, o.startLat, o.startLng, o.endAddress, o.endLat, o.endLng,
         o.boardingTime, o.getoffTime, o.estimatedPrice, o.orderMoney, o.payMoney, o.discountedPrice, o.couponId, o.payType, o.payTime, o.`state`, o.status, o.createTime,
         o.startDistance,o.startPrice,o.overDriveDistance,o.overDrivePrice,o.longDistance,o.longDistancePrice,o.overLongDistance,o.overLongDistancePrice,
-        o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,a.nickname AS userName,
-        a.phone AS userPhone,a.cancelCount,a.status AS userStatus,d.name AS driverName,d.phone AS driverPhone
+        o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,
+        o.userPhone,o.userName,a.cancelCount,a.status AS userStatus,d.name AS driverName,d.phone AS driverPhone
     </sql>
 
     <sql id="Base_Column_Server_Order">
@@ -69,7 +69,7 @@
         o.boardingTime, o.getoffTime, o.estimatedPrice, o.orderMoney, o.payMoney, o.discountedPrice, o.couponId, o.payType, o.payTime, o.`state`, o.status, o.createTime,
         o.startDistance,o.startPrice,o.overDriveDistance,o.overDrivePrice,o.longDistance,o.longDistancePrice,o.overLongDistance,o.overLongDistancePrice,
         o.waitTime,o.waitTimePrice,o.outWaitTime,o.outWaitTimePrice,o.badWeatherDistance,o.badWeatherPrice,o.overBadWeatherDistance,o.overBadWeatherPrice,
-        d.name AS driverName,d.phone AS driverPhone
+        o.userPhone,o.userName,d.name AS driverName,d.phone AS driverPhone
     </sql>
 
     <select id="getOrderList" resultType="com.stylefeng.guns.modular.system.controller.resp.TOrderResp">
@@ -122,7 +122,7 @@
         GROUP BY `month`
     </select>
     <select id="getDataStatisticsOrderCount" resultType="com.stylefeng.guns.modular.system.controller.resp.PerformanceTableResp">
-        SELECT date_format(o.createTime, '%Y-%m') AS monthTime,COUNT(o.id) AS amount,d.userName
+        SELECT date_format(o.payTime, '%Y-%m') AS monthTime,COUNT(o.id) AS amount,d.userName
         FROM t_order o
         LEFT JOIN (SELECT id,name AS userName from t_driver) d ON o.driverId = d.id
         <where>
@@ -130,7 +130,7 @@
                 AND o.agentId = #{agentId}
             </if>
             <if test="monthDate != null and monthDate != ''">
-                AND date_format(o.createTime, '%Y-%m') LIKE concat('',#{monthDate},'%')
+                AND date_format(o.payTime, '%Y-%m') LIKE concat('',#{monthDate},'%')
             </if>
             AND (o.`state` = 107 OR o.`state` = 108 OR o.`state` = 109)
             AND d.userName is not null
@@ -236,8 +236,16 @@
                     #{id}
                 </foreach>
             </if>
-            <if test="type != null">
-                AND `state` = #{type}
+            <if test="type == 1">
+                AND `state` = 101
+            </if>
+            <if test="type == 2">
+                AND (`state` = 107
+                OR `state` = 108
+                OR `state` = 109)
+            </if>
+            <if test="type == 3">
+                AND `state` = 301
             </if>
             <if test="localDate != null">
                 AND date_format(createTime, '%Y-%m-%d') LIKE concat('',#{localDate},'%')
@@ -391,5 +399,21 @@
         </where>
         GROUP BY `month`
     </select>
+    <select id="getValidOrderCount" resultType="java.lang.Integer">
+        select count(id)
+        from t_order
+        <where>
+            <if test="driverId != null">
+                AND driverId = #{driverId}
+            </if>
+            <if test="orderMoney != null">
+                AND orderMoney &gt; #{orderMoney}
+            </if>
+            <if test="month != null">
+                AND DATE_FORMAT(createTime, '%Y-%m') = #{month}
+            </if>
+            AND (`state` = 107 OR `state` = 108 OR `state` = 109)
+        </where>
+    </select>
 
 </mapper>

--
Gitblit v1.7.1