运输路线

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

@@ -325,26 +325,25 @@
         WHERE user_id = #{userId}
     </select>
     <select id="paymentContext" resultType="com.njzscloud.supervisory.order.pojo.result.PaymentContextResult">
-        SELECT
+        SELECT a.id               AS orderId,
-            a.id AS orderId,
+               a.trans_company_id AS transCompanyId,
-            a.trans_company_id AS transCompanyId,
+               a.sn,
-            a.sn,
+               a.settlement_way   AS oi_pay_way,
-            a.settlement_way as oi_pay_way,
+               a.out_trade_no,
-            a.out_trade_no,
+               bc.user_id         AS companyUserId,
-            bc.user_id AS companyUserId,
+               ma1.id             AS companyAccountId,
-            ma1.id AS companyAccountId,
+               ma1.money          AS companyBalance,
-            ma1.money AS companyBalance,
+               ma1.revenue,
-            ma1.revenue,
+               bc.settlement_way,
-            bc.settlement_way,
+               sua.wechat_openid,
-            sua.wechat_openid,
+               a.refund_money,
-            a.refund_money,
+               a.settle_money,
-            a.settle_money,
+               bd.user_id         AS driver_user_id
-            bd.user_id AS driver_user_id
         FROM order_info a
-             LEFT JOIN biz_company bc ON bc.id = a.trans_company_id
+                 LEFT JOIN biz_company bc ON bc.id = a.trans_company_id
-             LEFT JOIN money_account ma1 ON ma1.station_id = a.trans_company_id
+                 LEFT JOIN money_account ma1 ON ma1.station_id = a.trans_company_id
-             LEFT JOIN biz_driver bd ON a.driver_id = bd.id
+                 LEFT JOIN biz_driver bd ON a.driver_id = bd.id
-             LEFT JOIN sys_user_account sua ON bd.user_id = sua.user_id
+                 LEFT JOIN sys_user_account sua ON bd.user_id = sua.user_id
         WHERE a.id = #{orderId}
     </select>
     <select id="getTruckInfo" resultType="com.njzscloud.supervisory.biz.pojo.entity.BizTruckEntity">
@@ -359,18 +358,19 @@
     </select>
     <select id="gpsLastOnlineTime"
             resultType="com.njzscloud.supervisory.device.pojo.entity.DeviceLocalizerEntity">
-        select *
+        SELECT *
-        from device_localizer
+        FROM device_localizer
-        where terminal_id = #{gpsId}
+        WHERE terminal_id = #{gpsId}
-          and deleted = 0
+          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>