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

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

@@ -2771,19 +2771,24 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             AtomicReference<String> oldCardNo = new AtomicReference<>("");
             AtomicReference<String> newCardNo = new AtomicReference<>("");
             oldvisitorDOList.forEach(v -> {
-                oldCardNo.set(oldCardNo.get() + v.getCredentialNo() + ";");
+                oldCardNo.set(oldCardNo.get() + v.getCredentialNo() + "(" + v.getName() + ")" + ";");
             });
             createVO.getTourist().forEach(v -> {
-                newCardNo.set(newCardNo.get() + v.getCardNo() + ";");
+                newCardNo.set(newCardNo.get() + v.getCardNo() + "(" + v.getName() + ")" + ";");
             });
             for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                 String cardNo = tradeVistorReqVO.getCardNo();
-                if (!StringUtils.isEmpty(cardNo)) {
+                String name = tradeVistorReqVO.getName();
+                if (!StringUtils.isEmpty(cardNo)||!StringUtils.isEmpty(name)) {
                     List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> StringUtils.equals(cardNo, v.getCredentialNo())).collect(Collectors.toList());
+                    List<TradeVisitorDO> nameCollect = oldvisitorDOList.stream().filter(v -> StringUtils.equals(name, v.getName())).collect(Collectors.toList());
                     if (collect.isEmpty()) {
                         auditType = 3;
                         changedFields0 = "游客信息发生变更：" + oldCardNo.get() + "->" + newCardNo.get();
                         break;
+                    }else if(nameCollect.isEmpty()){
+                        changedFields0 = "游客信息发生变更：" + oldCardNo.get() + "->" + newCardNo.get();
+                        break;
                     }
                 }
             }