修改报表退款和流水号同步

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderRepositoryServiceImpl.java

@@ -331,6 +331,9 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
         if (tradeOrderPayDO.getBillNo() != null) {
             orderPayUpdateWrapper.set(TradeOrderPayDO::getBillNo, tradeOrderPayDO.getBillNo());
         }
+        if (tradeOrderPayDO.getPosNo() != null) {
+            orderPayUpdateWrapper.set(TradeOrderPayDO::getPosNo, tradeOrderPayDO.getPosNo());
+        }
         tradeOrderPayMapper.update(orderPayUpdateWrapper);
     }
 

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

@@ -54,7 +54,7 @@
 
             <!-- 2. 订单退款记录 -->
             SELECT
-                DATE_FORMAT(pay.update_time, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(tr.refund_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,
@@ -65,10 +65,10 @@
             FROM trade_order_pay pay
             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
-            WHERE pay.deleted = 0
+            left join trade_refund tr on tr.order_id = pay.order_id AND tr.deleted = 0
+             WHERE pay.deleted = 0
               AND pay.pay_status = 1
-              AND pay.refund_amount IS NOT NULL
-              AND pay.refund_amount &gt; 0
+              AND tr.refund_status = 6
 
             UNION ALL
 
@@ -166,7 +166,7 @@
 
             <!-- 2. 订单退款记录 -->
             SELECT
-                DATE_FORMAT(pay.update_time, '%Y-%m-%d %H:%i:%s') AS transactionTime,
+                DATE_FORMAT(tr.refund_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,
@@ -177,11 +177,10 @@
             FROM trade_order_pay pay
             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
-            WHERE pay.deleted = 0
+           left join trade_refund tr on tr.order_id = pay.order_id AND tr.deleted = 0
+           WHERE pay.deleted = 0
               AND pay.pay_status = 1
-              AND pay.refund_amount IS NOT NULL
-              AND pay.refund_amount &gt; 0
-
+              AND tr.refund_status = 6
             UNION ALL
 
             <!-- 3. 充值记录(分销商在线充值) -->

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

@@ -41,7 +41,7 @@
         LEFT JOIN (
             SELECT order_id, SUM(fee) AS refundFee
             FROM trade_refund
-            WHERE deleted = 0 AND refund_status IN (3)
+            WHERE deleted = 0 AND refund_status IN (6)
             GROUP BY order_id
         ) refund_fee_sum ON o.id = refund_fee_sum.order_id
         WHERE o.deleted = 0
@@ -124,7 +124,7 @@
         LEFT JOIN (
             SELECT order_id, SUM(fee) AS refundFee
             FROM trade_refund
-            WHERE deleted = 0 AND refund_status IN (3)
+            WHERE deleted = 0 AND refund_status IN (6)
             GROUP BY order_id
         ) refund_fee_sum ON o.id = refund_fee_sum.order_id
         WHERE o.deleted = 0