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

@@ -210,6 +210,11 @@
                 INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
                 LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
                 LEFT JOIN trade_visitor tv ON tdl.id = tv.detail_id AND tv.deleted = 0
+                LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0 AND td.id = torm.order_id
+                LEFT JOIN resource_room_model rrm ON torm.room_model_id = rrm.id
+                LEFT JOIN product_spu ps ON ps.id = tdl.product_id
+                LEFT JOIN ota_distributor od ON od.id = td.source_id
+                LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
                 LEFT JOIN area ar ON tv.nationality = ar.id
                 WHERE td.deleted = 0
                     AND tou.deleted = 0
@@ -222,21 +227,24 @@
                 SELECT GROUP_CONCAT(CONCAT(roomName, '(', roomNum, ')') SEPARATOR ',')
                 FROM (
                 SELECT
-                CONCAT(rrm.name, tm.floor, 'F') AS roomName,
-                tm.floor AS floor,
-                COUNT(DISTINCT tm.room_index_id) AS roomNum
+                CONCAT(rrm.name, torm.floor, 'F') AS roomName,
+                torm.floor AS floor,
+                COUNT(DISTINCT torm.room_index_id) AS roomNum
                 FROM trade_order td
                 INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
                 LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
                 LEFT JOIN trade_visitor tv ON tdl.id = tv.detail_id AND tv.deleted = 0
-                LEFT JOIN trade_order_room_model tm ON tv.room_index_id = tm.room_index_id AND tm.deleted = 0 AND td.id = tm.order_id
-                LEFT JOIN resource_room_model rrm ON tm.room_model_id = rrm.id
+                LEFT JOIN trade_order_room_model torm ON tv.room_index_id = torm.room_index_id AND torm.deleted = 0 AND td.id = torm.order_id
+                LEFT JOIN resource_room_model rrm ON torm.room_model_id = rrm.id
+                LEFT JOIN product_spu ps ON ps.id = tdl.product_id
+                LEFT JOIN ota_distributor od ON od.id = td.source_id
+                LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
                 WHERE td.deleted = 0
                     AND tou.deleted = 0
                     AND tv.type IS NOT NULL
                 <include refid="commonWhereConditions"/>
-                GROUP BY rrm.name, tm.floor
-                ORDER BY tm.floor
+                GROUP BY rrm.name, torm.floor
+                ORDER BY torm.floor
             ) room_stats
             ), '') AS roomStats
         FROM (
@@ -252,6 +260,10 @@
             INNER JOIN trade_order_user tou ON td.id = tou.order_id AND tou.deleted = 0
             LEFT JOIN trade_detail tdl ON td.id = tdl.order_id AND tdl.deleted = 0
             LEFT JOIN trade_visitor tv ON tdl.id = tv.detail_id AND tv.deleted = 0
+            LEFT JOIN product_spu ps ON ps.id = tdl.product_id
+            LEFT JOIN ota_distributor od ON od.id = td.source_id
+            LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
+            left join trade_order_room_model torm on tv.room_index_id = torm.room_index_id and torm.deleted =0 AND td.id = torm.order_id
             LEFT JOIN (
             SELECT order_id, SUM(pay_amount) AS actual_amount
             FROM trade_order_pay