报表调整

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

@@ -159,11 +159,12 @@
         '' AS boardingTime,
         '' AS orderNo,
         IFNULL(d.name, '') AS travelAgencyName,
-        r.pay_type AS paymentMethod,
+        9 AS paymentMethod,
         3 AS transactionType,
         r.money AS amount,
-        r.recharge_no  AS bankSerialNo
+        pay.pos_no  AS bankSerialNo
         FROM ota_distributor_self_recharge r
+        left join trade_order_pay pay on r.id = pay.order_id  and pay.deleted = 0 and pay.pay_status  = 1
         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
@@ -284,11 +285,12 @@
         '' AS boardingTime,
         '' AS orderNo,
         IFNULL(d.name, '') AS travelAgencyName,
-        r.pay_type AS paymentMethod,
+        9 AS paymentMethod,
         3 AS transactionType,
         r.money AS amount,
-        r.recharge_no  AS bankSerialNo
+        pay.pos_no  AS bankSerialNo
         FROM ota_distributor_self_recharge r
+        left join trade_order_pay pay on r.id = pay.order_id  and pay.deleted = 0 and pay.pay_status  = 1
         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