Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/HuaNongCrawlerConfigureParameters.java

@@ -47,5 +47,10 @@ public class HuaNongCrawlerConfigureParameters implements ConfigureParameters {
      * 设备码
      */
     private String deviceid;
+    /**
+     * 业务员
+     */
+    private String salesperson;
+
 
 }

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerQuoteProcessServiceImpl.java

@@ -236,7 +236,13 @@ public class HuaNongCrawlerQuoteProcessServiceImpl implements HuaNongCrawlerQuot
             HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.ProducerListDTO producerListDTO = producerMap.get(parameters.getProducer());
 
             HuaNongCrawlerComInfoQueryResponse.ComListDTO comListDTO = com.get(parameters.getComCode());
-            HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO handlerListDTO = Optional.ofNullable(handlerList).filter(CollectionUtils::isNotEmpty).map(list -> list.get(0)).orElse(null);
+            HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.HandlerListDTO handlerListDTO = Optional.ofNullable(handlerList)
+                    .filter(CollectionUtils::isNotEmpty)
+                    .map(list -> list.stream()
+                            .filter(dto -> parameters.getSalesperson().equals(dto.getHandlerName()))
+                            .findFirst()
+                            .orElse(null))
+                    .orElse(null);
             HuaNongCrawlerUserTypeAndProxyInfoQueryResponse.AgentInfoListDTO agentInfoListDTO = agentInfoListDTOMap.values().stream()
                     .filter(dto -> dto.getAgentName() != null && dto.getAgentName().equals(parameters.getHandlerCode()))
                     .findFirst()

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/service/impl/HuaNongCrawlerRequestImpl.java

@@ -615,6 +615,13 @@ public class HuaNongCrawlerRequestImpl implements HuaNongCrawlerRequest {
                 String errorMessage = iLogPreUdwMess.replace("\n", "").replace(" ", "");
                 throw new SystemException(errorMessage);
             }
+            // 检查已完税
+            if (iLogPreUdwMess != null && !iLogPreUdwMess.isEmpty() && iLogPreUdwMess.contains("已完税")) {
+                // 去除换行和空格
+                String errorMessage = iLogPreUdwMess.replace("\n", "").replace(" ", "");
+                throw new SystemException(errorMessage);
+            }
+
         }
     }