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 |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 86e5398..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>
@@ -217,7 +218,7 @@
                tc.`name`,
                too.s_email as mailAddr,
                tp.car_price    as amount,
-               too.paid    as unitPrice
+               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
@@ -225,4 +226,8 @@
         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