游客信息报表修改

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -285,7 +285,7 @@
             LEFT JOIN (
             SELECT order_id, SUM(pay_amount) AS actual_amount
             FROM trade_order_pay
-            WHERE pay_status = 1
+            WHERE pay_status = 1 or order_type = 2
             GROUP BY order_id
             ) topay ON td.id = topay.order_id
         WHERE

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeVisitorMapper.xml

@@ -268,7 +268,7 @@
             CASE WHEN tjz.is_jz = 1 THEN '是' ELSE '否' END AS jz,
             DATE_FORMAT(pv.start_time, '%Y.%m.%d') AS travelDate,
             tor.pay_amount AS amount,
-            top.pay_amount AS payAmount,
+            tor.real_pay_amount AS payAmount,
             tor.deposi,
             tv.room_index_id AS roomIndexId,
             torm.room_model_name AS roomType,