报表调整

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

@@ -44,7 +44,7 @@
             FROM trade_order_pay pay
         LEFT JOIN trade_order o1 ON pay.order_id = o1.id AND o1.deleted = 0
             LEFT JOIN product_voyage voy ON o1.voyage_id = voy.id AND voy.deleted = 0
-            WHERE pay.deleted = 0
+            WHERE pay.deleted = 0 and pay.order_type = 0
               AND pay.pay_status = 1
             AND pay.payment_type in (1,2,3,4,5,6,9,10)
             AND pay.sell_method != 102
@@ -66,7 +66,7 @@
             LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
             left join trade_refund tr on tr.order_id = pay.order_id AND tr.deleted = 0
-             WHERE pay.deleted = 0
+             WHERE pay.deleted = 0  and pay.order_type = 0
               AND pay.pay_status = 1
               AND tr.refund_status = 6
 
@@ -86,7 +86,7 @@
         LEFT JOIN (select r.bill_id ,r.order_id FROM ota_bill_order r where r.deleted = 0 GROUP BY r.bill_id) obo ON obo.bill_id = bill.id
         LEFT JOIN  trade_order o ON obo.order_id = o.id and o.deleted = 0
         LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
-        WHERE pay.deleted = 0
+        WHERE pay.deleted = 0  and pay.order_type = 0
         AND pay.pay_status = 1
         AND bill.bill_status in (1,2)
         AND pay.payment_type = 5
@@ -148,10 +148,24 @@
         LEFT JOIN (select r.bill_id ,r.order_id FROM ota_bill_order r where r.deleted = 0 GROUP BY r.bill_id) obo ON obo.bill_id = bill.id
         LEFT JOIN  trade_order o ON obo.order_id = o.id and o.deleted = 0
         LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
-        WHERE pay.deleted = 0
+        WHERE pay.deleted = 0  and pay.order_type = 0
         AND pay.pay_status = 1
         AND bill.bill_status in (1,2)
         AND pay.sell_method = 102
+        <!-- 6. 自助充值记录 -->
+        UNION ALL
+        SELECT
+        DATE_FORMAT(r.create_time , '%Y-%m-%d %H:%i:%s') AS transactionTime,
+        '' AS boardingTime,
+        '' AS orderNo,
+        IFNULL(d.name, '') AS travelAgencyName,
+        r.pay_type AS paymentMethod,
+        3 AS transactionType,
+        r.money AS amount,
+        r.recharge_no  AS bankSerialNo
+        FROM ota_distributor_self_recharge r
+        right JOIN ota_distributor d ON r.distributor_id = d.id AND d.deleted = 0
+        WHERE r.deleted = 0 and r.recharge_state  = 1
         ) t
         WHERE 1 = 1
         <include refid="queryConditions"/>
@@ -175,7 +189,7 @@
         FROM trade_order_pay pay
         LEFT JOIN trade_order o1 ON pay.order_id = o1.id AND o1.deleted = 0
         LEFT JOIN product_voyage voy ON o1.voyage_id = voy.id AND voy.deleted = 0
-        WHERE pay.deleted = 0
+        WHERE pay.deleted = 0 and pay.order_type = 0
         AND pay.pay_status = 1
         AND pay.payment_type in (1,2,3,4,5,6,9,10)
         AND pay.sell_method != 102
@@ -199,7 +213,7 @@
             LEFT JOIN trade_order o ON pay.order_id = o.id AND o.deleted = 0
             LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
            left join trade_refund tr on tr.order_id = pay.order_id AND tr.deleted = 0
-           WHERE pay.deleted = 0
+           WHERE pay.deleted = 0 and pay.order_type = 0
               AND pay.pay_status = 1
               AND tr.refund_status = 6
             UNION ALL
@@ -219,7 +233,7 @@
         LEFT JOIN (select r.bill_id ,r.order_id FROM ota_bill_order r where r.deleted = 0 GROUP BY r.bill_id) obo ON obo.bill_id = bill.id
         LEFT JOIN  trade_order o ON obo.order_id = o.id and o.deleted = 0
         LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
-        WHERE pay.deleted = 0
+        WHERE pay.deleted = 0 and pay.order_type = 0
         AND pay.pay_status = 1
         AND bill.bill_status in (1,2)
         AND pay.payment_type = 5
@@ -258,10 +272,25 @@
         LEFT JOIN (select r.bill_id ,r.order_id FROM ota_bill_order r where r.deleted = 0 GROUP BY r.bill_id) obo ON obo.bill_id = bill.id
         LEFT JOIN  trade_order o ON obo.order_id = o.id and o.deleted = 0
         LEFT JOIN product_voyage voy ON o.voyage_id = voy.id AND voy.deleted = 0
-        WHERE pay.deleted = 0
+        WHERE pay.deleted = 0 and pay.order_type = 0
         AND pay.pay_status = 1
         AND bill.bill_status in (1,2)
         AND pay.sell_method = 102
+
+        <!-- 6. 自助充值记录 -->
+        UNION ALL
+        SELECT
+        DATE_FORMAT(r.create_time , '%Y-%m-%d %H:%i:%s') AS transactionTime,
+        '' AS boardingTime,
+        '' AS orderNo,
+        IFNULL(d.name, '') AS travelAgencyName,
+        r.pay_type AS paymentMethod,
+        3 AS transactionType,
+        r.money AS amount,
+        r.recharge_no  AS bankSerialNo
+        FROM ota_distributor_self_recharge r
+        right JOIN ota_distributor d ON r.distributor_id = d.id AND d.deleted = 0
+        WHERE r.deleted = 0 and r.recharge_state  = 1
         ) t
         WHERE 1 = 1
         <include refid="queryConditions"/>