修改按房间统计

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

@@ -293,6 +293,7 @@
              FROM trade_order_policy top
              WHERE top.order_id = tor.id AND top.deleted = 0
              AND (top.policy_name LIKE '升楼层%' OR top.policy_name LIKE '套房95%')
+             AND JSON_CONTAINS(top.rooms, JSON_QUOTE(tv.room_index_id), '$')
             ) AS policyName,
             tor.remark,
             tor.jd_remark as jdRemark,

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

@@ -163,13 +163,13 @@
         SELECT
         o.voyage_id,
 
-        SUM(CASE WHEN top.policy_name LIKE '升楼层%' THEN COALESCE(top.use_num, 0) * 2 ELSE 0 END) AS upgradeFloorCount,
+        SUM(CASE WHEN top.policy_name LIKE '升楼层%' THEN COALESCE(top.use_num, 0) ELSE 0 END) AS upgradeFloorCount,
 
-        SUM(CASE WHEN top.policy_name LIKE '套房95%' THEN COALESCE(top.use_num, 0) * 2 ELSE 0 END) AS suiteDiscountCount
+        SUM(CASE WHEN top.policy_name LIKE '套房95%' THEN COALESCE(top.use_num, 0)  ELSE 0 END) AS suiteDiscountCount
         FROM trade_order_policy top
         INNER JOIN trade_order o ON o.id = top.order_id AND o.deleted = 0
         WHERE top.deleted = 0
-        AND o.order_status IN (14, 13, 6, 1)
+        AND o.order_status IN (15, 14, 13, 10, 12, 9, 8, 7, 6, 5, 4, 3, 1, 0)
         AND (top.policy_name LIKE '升楼层%' OR top.policy_name LIKE '套房95%')
         GROUP BY o.voyage_id
         ) marketing_policy_stats ON v.id = marketing_policy_stats.voyage_id