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

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

@@ -3243,12 +3243,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
 
         // 按游客类型统计数量
-        Map<String, Long> typeCountMap = roomVisitors.stream()
+        // Map<String, Long> typeCountMap = roomVisitors.stream()
 //                .filter(v -> StringUtils.isNotEmpty(v.getVisitorType()))
-                .collect(Collectors.groupingBy(TouristExportVisitorVO::getVisitorType, Collectors.counting()));
+          //      .collect(Collectors.groupingBy(TouristExportVisitorVO::getVisitorType, Collectors.counting()));
+        Map<String, List<TouristExportVisitorVO>> collect = roomVisitors.stream().collect(Collectors.groupingBy(TouristExportVisitorVO::getVisitorType));
 
         StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, Long> entry : typeCountMap.entrySet()) {
+
+        /*for (Map.Entry<String, Long> entry : typeCountMap.entrySet()) {
             if (sb.length() > 0) {
                 sb.append("/");
             }
@@ -3259,6 +3261,18 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 sb.append(entry.getValue()).append("个").append(getPersonTypeDes1(entry.getKey()));
             }
 
+        }*/
+
+        for (Map.Entry<String, List<TouristExportVisitorVO>> entry : collect.entrySet()) {
+            for (TouristExportVisitorVO touristExportVisitorVO : entry.getValue()) {
+                if (StringUtils.isNotBlank(touristExportVisitorVO.getTypeName()) && sb.indexOf(touristExportVisitorVO.getTypeName()) == -1) {
+                    if (sb.length() > 0) {
+                        sb.append("/");
+                    }
+                    sb.append(touristExportVisitorVO.getTypeName());
+                }
+
+            }
         }
 
         return sb.toString();