增加计调 游客计划

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TouristExportVisitorVO.java

@@ -102,6 +102,10 @@ public class TouristExportVisitorVO {
     @Schema(description = "优惠政策")
     private String policyName;
 
+    @Schema(description = "游船计划")
+    private String jdRemark;
+
+
     @Schema(description = "备注")
     private String remark;
 }

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

@@ -4335,6 +4335,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
                         item.put("visitorHome", StringUtils.isEmpty(visitor.getVisitorType()) ? "" : DictFrameworkUtils.getDictDataLabel(DictTypeConstants.TOUR_TYPE, visitor.getVisitorType())); // 游客入住类型
 
+                        item.put("jdRemark", StringUtils.isEmpty(visitor.getJdRemark()) ? "" : visitor.getJdRemark()); // 游船计划
+
                         item.put("birthday", StringUtils.isEmpty(visitor.getBirthday()) ? "" : visitor.getBirthday()); // 生日
                         item.put("mobile", StringUtils.isEmpty(visitor.getMobile()) ? "" : visitor.getMobile()); // 手机号
                         item.put("jz", StringUtils.isEmpty(visitor.getJz()) ? "" : visitor.getJz()); // 是否接站

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

@@ -290,6 +290,7 @@
             a.name AS nationalityName,
             GROUP_CONCAT(ps.product_name) AS valueAddedService,
             tor.remark,
+            tor.jd_remark as jdRemark,
             tor.order_status as orderStatus
         FROM trade_visitor tv
         INNER JOIN trade_order tor ON tv.order_id = tor.id AND tor.deleted = 0