fix: 修改游船确认书问题

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/insurance/InsuranceServiceImpl.java

@@ -166,9 +166,9 @@ public class InsuranceServiceImpl implements InsuranceService {
         insuranceOrderInfoDTO.setApplicantSex(1);
 
         //销售人信息
-        insuranceOrderInfoDTO.setSellCorp("测试公司");
-        insuranceOrderInfoDTO.setSellDept("测试部门");
-        insuranceOrderInfoDTO.setSellUser("测试人");
+        insuranceOrderInfoDTO.setSellCorp("营销中心");
+        insuranceOrderInfoDTO.setSellDept("营销中心");
+        insuranceOrderInfoDTO.setSellUser("营销中心");
         insuranceApplyReqDTO.setOrder(insuranceOrderInfoDTO);
 
         //被保人对象列表, 其下可多位被保险人, 他们在同个订单下

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

@@ -63,6 +63,7 @@ import com.yc.ship.module.resource.dal.dataobject.roommodel.ResourceRoomModelDO;
 import com.yc.ship.module.resource.dal.dataobject.route.ResourceRouteDO;
 import com.yc.ship.module.resource.dal.dataobject.ship.ResourceShipDO;
 import com.yc.ship.module.resource.dal.mysql.route.ResourceRouteMapper;
+import com.yc.ship.module.resource.enums.DictTypeConstants;
 import com.yc.ship.module.resource.service.roommodel.ResourceRoomModelService;
 import com.yc.ship.module.resource.service.ship.ResourceShipService;
 import com.yc.ship.module.system.api.dict.DictDataApi;
@@ -1971,7 +1972,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         orderData.put("amount", orderConfirmation.getAmount());
 
         VoyageRespVO voyage = orderConfirmation.getVoyage();
-        orderData.put("voyageCode", voyage.getCode());
+        //此处改为订单号最后的序号，如CJXLY-20260526-YC-13订单，登船序号应为13
+        String[] split = orderConfirmation.getOrderNo().split("-");
+        String split1 = split[split.length - 1];
+        orderData.put("voyageCode", split1);
 
         orderData.put("boardingTime", DateUtil.format(Date.from(voyage.getBoardingTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
         orderData.put("startTime", DateUtil.format(Date.from(voyage.getStartTime().atZone(ZoneOffset.ofHours(8)).toInstant()), "yyyy-MM-dd HH:mm"));
@@ -2023,6 +2027,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
         orderData.put("totalMoney", totalMoney);
         orderData.put("creatorName", orderConfirmation.getCreatorName());
+        orderData.put("auditorName", orderConfirmation.getAuditorName());
         orderData.put("firstDate", DateUtil.format(org.apache.commons.lang3.time.DateUtils.addDays(Date.from(orderConfirmation.getUpdateTime().atZone(ZoneOffset.ofHours(8)).toInstant()), 7), "yyyy-MM-dd"));
         orderData.put("lastDate", DateUtil.format(org.apache.commons.lang3.time.DateUtils.addDays(Date.from(voyage.getStartTime().atZone(ZoneOffset.ofHours(8)).toInstant()), -21), "yyyy-MM-dd"));
         orderData.put("today", DateUtil.format(new Date(), "yyyy-MM-dd"));
@@ -2038,7 +2043,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             item.put("nationality", StringUtils.isEmpty(tradeVisitorDO.getNationalityName()) ? "" : tradeVisitorDO.getNationalityName());
             item.put("gender", (tradeVisitorDO.getGender() == null || tradeVisitorDO.getGender() == 0) ? "女" : "男");
             item.put("dob", StringUtils.isEmpty(tradeVisitorDO.getBirthday()) ? "" : tradeVisitorDO.getBirthday());
-            item.put("credentialTypeName", DictFrameworkUtils.getDictDataLabel("", tradeVisitorDO.getCredentialType()));
+            item.put("credentialTypeName", DictFrameworkUtils.getDictDataLabel(DictTypeConstants.VISITOR_CREDENTIAL_TYPE, tradeVisitorDO.getCredentialType()));
             item.put("idno", StringUtils.isEmpty(tradeVisitorDO.getCredentialNo()) ? "" : tradeVisitorDO.getCredentialNo());
             tradeVisitorData.add(item);
         }