From 1707d15796d7dc78812f19b9c34868c8cb38a714 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期日, 15 十月 2023 17:56:57 +0800
Subject: [PATCH] broker 卡车公司端

---
 src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
index c62711f..f5caa11 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
+++ b/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderMapper.xml
@@ -182,7 +182,7 @@
 	LEFT JOIN t_user t3 on t1.user_id =t3.id
 	LEFT JOIN t_port t4 on t1.`port` = t4.id
     LEFT JOIN t_group t5 on t3.group_id = t5.id
-	where t1.company_id = #{companyId} and t1.order_type=#{type}
+	where t1.company_id = #{companyId} and t1.order_type=#{type} and t1.status != 17
 	<if test="sTime !=null">
         and (t1.shipment_date between  #{sTime} and #{eTime} or t1.delivery_date between  #{sTime} and #{eTime})
     </if>
@@ -203,6 +203,7 @@
     </if>
 GROUP BY
 	t1.id
+	order by t1.create_time desc
 
 
     </select>
@@ -212,5 +213,21 @@
             and success_time BETWEEN #{sTime} and #{eTime}
         </if>
     </select>
+    <select id="queryAllOrderDatas" resultType="java.util.Map">
+        SELECT too.id,
+               tc.`name`,
+               too.s_email as mailAddr,
+               tp.car_price    as amount,
+               tp.price    as unitPrice
+        FROM `t_order` AS too
+                 JOIN t_user tu ON too.user_id = tu.id
+                 JOIN t_company tc ON too.company_id = tc.id
+                 join t_price tp on too.id = tp.order_id
+        WHERE too.STATUS = 1
+    </select>
+
+    <select id="getLonLat" resultType="java.util.Map">
+        select lon,lat from t_order_lonlat where orderId =#{orderId}
+    </select>
 
 </mapper>

--
Gitblit v1.7.1