订单明细修改

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/report/BankTransactionDetailsMapper.xml

@@ -47,14 +47,14 @@
             LEFT JOIN product_voyage voy ON IFNULL(o1.voyage_id, o2.voyage_id) = voy.id AND voy.deleted = 0
             WHERE pay.deleted = 0
               AND pay.pay_status = 1
-            AND pay.payment_type in (1,2,3,4,9,10)
+            AND pay.payment_type in (1,2,3,4,5,6,9,10)
        /* --- and o.order_status in (3,6,7,8,9,10,12,13,15)
         -- AND pay.refund_amount = 0*/
         UNION ALL
 
             <!-- 2. 订单退款记录 -->
             SELECT
-                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(pay.update_time, '%Y-%m-%d %H:%i:%s') AS transactionTime,
                 DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
                 o.order_no AS orderNo,
                 o.source_name AS travelAgencyName,
@@ -158,7 +158,7 @@
         LEFT JOIN product_voyage voy ON IFNULL(o1.voyage_id, o2.voyage_id) = voy.id AND voy.deleted = 0
         WHERE pay.deleted = 0
         AND pay.pay_status = 1
-        AND pay.payment_type in (1,2,3,4,9,10)
+        AND pay.payment_type in (1,2,3,4,5,6,9,10)
       /*  -- and o.order_status in (3,6,7,8,9,10,12,13,15)
         -- AND pay.refund_amount = 0*/
 
@@ -166,7 +166,7 @@
 
             <!-- 2. 订单退款记录 -->
             SELECT
-                DATE_FORMAT(pay.payment_date, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(pay.update_time, '%Y-%m-%d %H:%i:%s') AS transactionTime,
                 DATE_FORMAT(voy.start_time, '%Y-%m-%d') AS boardingTime,
                 o.order_no AS orderNo,
                 o.source_name AS travelAgencyName,