Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -3551,10 +3551,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             case "babyNonTake":
                 des = "婴儿";
                 break;
-            case "adultTake":
-            case "adultPlus":
             case "leader":
+                des = "领队";
+                break;
             case "with":
+                des = "陪同";
+                break;
+            case "adultTake":
+            case "adultPlus":
             default:
                 des = "成人";
                 break;
@@ -3575,10 +3579,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             case "babyNonTake":
                 des = "Infants";
                 break;
-            case "adultTake":
-            case "adultPlus":
             case "leader":
+                des = "Leader";
+                break;
             case "with":
+                des = "With";
+                break;
+            case "adultTake":
+            case "adultPlus":
             default:
                 des = "Adults";
                 break;

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

@@ -2513,28 +2513,35 @@
     <select id="selectConfirmationCountry"
             resultType="com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationCountryRespVO">
         SELECT
-            t5.actual_price,
+            t5.room_model_type_id,
+            t3.short_name room_model_short_name,
+            t3.NAME room_model_name,
+            ifnull( t1.nationality, 1 ) nationality,
+            ifnull( t4.NAME, '中国' ) nationality_name,
             t1.room_model_id,
-            t2.short_name room_model_short_name,
-            t2.NAME room_model_name,
-            t3.type,
-            ifnull( t3.nationality, 1 ) nationality,
-            t3.floor,
-            IFNULL( t4.`name`, '中国' ) nationality_name,
-            count( t3.id ) num
+            t1.type,
+            ifnull(t1.floor,'0') floor,
+            count( t1.id ) num,
+            t2.actual_price actual_price
         FROM
-            trade_order_room_model t1
-                LEFT JOIN resource_room_model t2 ON t1.room_model_id = t2.id  and t2.deleted = 0
-                LEFT JOIN trade_visitor t3 ON t1.room_index_id = t3.room_index_id  and t3.deleted = 0
-                LEFT JOIN trade_detail t5 on t3.id = t5.visitor_id and t5.deleted =0 and t5.product_type = 0
-                LEFT JOIN area t4 ON t3.nationality = t4.id
+            trade_visitor t1
+                LEFT JOIN trade_detail t2 ON t1.id = t2.visitor_id
+                AND t2.product_type = 0
+                AND t1.deleted = 0
+                LEFT JOIN resource_room_model t3 ON t1.room_model_id = t3.id
+                AND t3.deleted = 0
+                LEFT JOIN area t4 ON t1.nationality = t4.id
+                LEFT JOIN trade_order_room_model t5 ON t1.room_index_id = t5.room_index_id
+                AND t5.deleted = 0
+                LEFT JOIN product_price_room_model_type t6 ON t5.room_model_type_id = t6.id
         WHERE
             t1.order_id = #{orderId}
-          AND t1.deleted = 0
         GROUP BY
             t1.room_model_id,
             t1.floor,
-            t3.type
+            t1.type,
+            t1.nationality,
+            t5.room_model_type_id
         ORDER BY
             floor DESC
     </select>