运输路线

njzscloud-svr/src/main/resources/mapper/order/OrderInfoMapper.xml

@@ -325,11 +325,10 @@
         WHERE user_id = #{userId}
     </select>
     <select id="paymentContext" resultType="com.njzscloud.supervisory.order.pojo.result.PaymentContextResult">
-        SELECT
-            a.id AS orderId,
+        SELECT a.id               AS orderId,
                a.trans_company_id AS transCompanyId,
                a.sn,
-            a.settlement_way as oi_pay_way,
+               a.settlement_way   AS oi_pay_way,
                a.out_trade_no,
                bc.user_id         AS companyUserId,
                ma1.id             AS companyAccountId,
@@ -359,18 +358,19 @@
     </select>
     <select id="gpsLastOnlineTime"
             resultType="com.njzscloud.supervisory.device.pojo.entity.DeviceLocalizerEntity">
-        select *
-        from device_localizer
-        where terminal_id = #{gpsId}
-          and deleted = 0
+        SELECT *
+        FROM device_localizer
+        WHERE terminal_id = #{gpsId}
+          AND deleted = 0
     </select>
     <select id="getRoute" resultType="java.lang.String">
         SELECT b.name route_name
         FROM order_route a
-                 INNER JOIN order_route_detail b ON a.id = b.order_route_id
+                 INNER JOIN order_route_detail b ON a.id = b.order_route_id AND b.deleted = 0
         WHERE a.order_id = #{id}
           AND b.name IS NOT NULL
           AND TRIM(b.name) != ''
+          AND a.deleted = 0
         ORDER BY b.sort, b.create_time, b.id
     </select>
 </mapper>