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/controller/admin/order/vo/order/TouristExportVisitorVO.java

@@ -62,6 +62,9 @@ public class TouristExportVisitorVO {
     @Schema(description = "入住类型（房型描述）")
     private String roomDescription;
 
+    @Schema(description = "用房数")
+    private String typeName;
+
     // ==================== 游客详情 ====================
     @Schema(description = "游客姓名")
     private String name;

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

@@ -2949,6 +2949,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             String adultNum = headInfo.get("adultNum") != null ? headInfo.get("adultNum").toString() :"0";
             // 儿童数
             String childBabyNum = headInfo.get("childBabyNum") != null ? headInfo.get("childBabyNum").toString() :"0";
+            // 婴儿数
+            String babyNum = headInfo.get("babyNum") != null ? headInfo.get("babyNum").toString() :"0";
             // 陪同数
             String withNum = headInfo.get("withNum") != null ? headInfo.get("withNum").toString() :"0";
             // 领队数
@@ -2972,6 +2974,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         personNumBuilder.append(childBabyNum).append(" 儿童");
                         hasContent = true;
                     }
+                    if (StringUtils.isNotEmpty(babyNum)) {
+                        if (hasContent) {
+                            personNumBuilder.append("/");
+                        }
+                        personNumBuilder.append(babyNum).append(" 婴儿");
+                        hasContent = true;
+                    }
                     if (StringUtils.isNotEmpty(leaderNum)) {
                         if (hasContent) {
                             personNumBuilder.append("/");
@@ -3243,7 +3252,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             if (sb.length() > 0) {
                 sb.append("/");
             }
-            sb.append(entry.getValue()).append("个").append(getPersonTypeDes1(entry.getKey()));
+            long count = roomVisitors.stream().filter(e -> "成人拼房".equals(e.getTypeName())).count();
+            if(count > 0) {
+                sb.append("成人拼房");
+            } else {
+                sb.append(entry.getValue()).append("个").append(getPersonTypeDes1(entry.getKey()));
+            }
+
         }
 
         return sb.toString();

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

@@ -195,6 +195,7 @@
             SUM(a.num2) AS childBabyNum,
             SUM(a.num3) AS withNum,
             SUM(a.num4) AS leaderNum,
+            SUM(a.num5) AS babyNum,
             SUM(a.payAmount) AS totalPayAmount,
             SUM(a.actual_amount) AS totalActualAmount,
             SUM(a.deposi) as deposi,
@@ -265,11 +266,12 @@
         FROM (
             SELECT
             COUNT(1) AS num,
-            SUM(CASE WHEN tv.type IN ('adultPlus', 'adultTake') THEN 1 ELSE 0 END) AS num1,
-            SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake','childTake','childPlus','childNonTake') THEN 1 ELSE 0 END) AS num2,
+            SUM(CASE WHEN tv.type IN ('adultPlus', 'adultTake') or tv.type IS NULL or tv.type = '' THEN 1 ELSE 0 END) AS num1,
+            SUM(CASE WHEN tv.type IN ('childTake','childPlus','childNonTake') THEN 1 ELSE 0 END) AS num2,
             SUM(CASE WHEN tv.type = 'with' THEN 1 ELSE 0 END) AS num3,
             SUM(CASE WHEN tv.type = 'leader' THEN 1 ELSE 0 END) AS num4,
-            td.pay_amount AS payAmount,
+        SUM(CASE WHEN tv.type IN ('babyTake','babyPlus','babyNonTake') THEN 1 ELSE 0 END) AS num5,
+        td.pay_amount AS payAmount,
             td.deposi,
             IFNULL(topay.actual_amount, 0) AS actual_amount
             FROM trade_order td

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

@@ -266,6 +266,7 @@
             tor.deposi,
             tv.room_index_id AS roomIndexId,
             torm.room_model_name AS roomType,
+            pprmt.type_name  AS typeName ,
             tv.name,
             tv.gender,
             tv.birthday,
@@ -290,6 +291,7 @@
         left JOIN product_spu ps on ps.id = td.product_id
         left join trade_order_pay top ON top.order_id = tor.id and top.deleted = 0 and top.pay_status = 1
         left Join trade_order_jz tjz on tjz.order_id = tor.id
+        left Join product_price_room_model_type pprmt on torm.room_model_type_id = pprmt.id
 
         WHERE tv.deleted = 0