fix: 处理导出的确认单和查看的确认单备注和航向不一致的问题

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

@@ -1975,6 +1975,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderData.put("linkMan", orderConfirmation.getLinkMan());
         orderData.put("linkMobile", orderConfirmation.getLinkMobile());
         orderData.put("amount", orderConfirmation.getAmount());
+        orderData.put("remark", orderConfirmation.getRemark());
 
         VoyageRespVO voyage = orderConfirmation.getVoyage();
         //此处改为订单号最后的序号，如CJXLY-20260526-YC-13订单，登船序号应为13
@@ -1986,11 +1987,12 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderData.put("startTime", DateUtil.format(Date.from(voyage.getStartTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
         orderData.put("leaveTime", DateUtil.format(Date.from(voyage.getLeaveTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
 
-        String resourceRoute = "宜昌-重庆";
-        String resourceRouteEn = "Yichang-Chongqing";
-        if (voyage.getRouteResp() != null && voyage.getRouteResp().getDirection() != null && voyage.getRouteResp().getDirection() != 1) {
-            resourceRoute = "重庆-宜昌";
-            resourceRouteEn = "Chongqing-Yichang";
+        ResourceRouteDO resourceRouteDO = orderConfirmation.getResourceRouteDO();
+        String resourceRoute = "重庆-宜昌";
+        String resourceRouteEn = "Chongqing-Yichang";
+        if (resourceRouteDO != null && resourceRouteDO.getDirection() != null && resourceRouteDO.getDirection() == 1) {
+            resourceRoute = "宜昌-重庆";
+            resourceRouteEn = "Yichang-Chongqing";
         }
         orderData.put("resourceRoute", resourceRoute);
         orderData.put("resourceRouteEn", resourceRouteEn);