导出增加营销政策

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

@@ -3972,7 +3972,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             templateName = "templates/tourist_template_operator.xlsx";
         } else {
             // 销售（或其他角色）：使用销售模板
-            templateName = "templates/tourist_template.xlsx";
+            templateName = "templates/tourist_template_seller.xlsx";
         }
         InputStream template = getClass().getClassLoader().getResourceAsStream(templateName);
         return getFile(reqVO, template, 0);
@@ -4356,7 +4356,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                         item.put("visitorType", getPersonTypeAll(visitor.getVisitorType())); // 游客类型（成人/儿童/婴儿）
                         item.put("nationalityName", StringUtils.isEmpty(visitor.getNationalityName()) ? "" : visitor.getNationalityName()); // 国籍（如：中国、美国）
                         item.put("valueAddedService", StringUtils.isEmpty(visitor.getValueAddedService()) ? "" : formatPolicyName(visitor.getValueAddedService())); // 增值服务（如：接送站、保险等）
-                        item.put("policyName", ""); // 优惠政策（如：早鸟优惠、团立减等）
+                        item.put("policyName", StringUtils.isEmpty(visitor.getPolicyName()) ? "" : formatPolicyName(visitor.getPolicyName())); // 优惠政策（升楼层/套房95折等）
                         item.put("remark", StringUtils.isEmpty(visitor.getRemark()) ? "" : visitor.getRemark()); // 备注信息
                         item.put("age", StringUtils.isEmpty(visitor.getAge()) ? "" : visitor.getAge()); // 年龄
 

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

@@ -289,6 +289,11 @@
             torm.floor as floor,
             a.name AS nationalityName,
             GROUP_CONCAT(ps.product_name) AS valueAddedService,
+            (SELECT GROUP_CONCAT(top.policy_name)
+             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%')
+            ) AS policyName,
             tor.remark,
             tor.jd_remark as jdRemark,
             tor.order_status as orderStatus