fix 国任起保日期取重复投保的日期

tenant/insurance/quotation-commons/src/main/java/com/jzg/quotation/commons/utils/TimeProcessing.java

@@ -81,6 +81,36 @@ public final class TimeProcessing {
     }
 
 
+    /**
+     * 获取日期 yyyy-MM-dd
+     *
+     * @param dateTime 格式 yyyy-MM-dd HH:mm:ss
+     * @return yyyy-MM-dd
+     */
+    public static String getDate(String dateTime) {
+        return dateTime.substring(0, 10);
+    }
+
+
+    /**
+     * 获取小时
+     *
+     * @param dateTime 格式 yyyy-MM-dd HH:mm:ss
+     * @return HH
+     */
+    public static Integer getHour(String dateTime) {
+        return Integer.parseInt(dateTime.substring(11, 13));
+    }
+    /**
+     * 获取分钟
+     *
+     * @param dateTime 格式 yyyy-MM-dd HH:mm:ss
+     * @return mm
+     */
+    public static Integer getMinute(String dateTime) {
+        return Integer.parseInt(dateTime.substring(14, 16));
+    }
+
 
     /**
      * 一年以后得时间

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/build/GuoRenCrawlerQuoteResultsVoBuild.java

@@ -59,18 +59,13 @@ public final class GuoRenCrawlerQuoteResultsVoBuild {
         quoteResultsVo.getCosts().setVvTax(vvTax);
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
 
-
-        quoteVo.getCiRiskInfoVo().setStartDate(calculationPremium.getCi().getPrptitemkindList().get(0).getStartDate() + " 00:00:00");
-        quoteVo.getCiRiskInfoVo().setEndDate(calculationPremium.getCi().getPrptitemkindList().get(0).getEndDate() + " 00:00:00");
         quoteResultsVo.setCiRiskInfoVo(quoteVo.getCiRiskInfoVo());
+        quoteResultsVo.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
 
         if (calculationPremium.getBi().getPrptitemkindList() != null) {
             List<KindInfoVo> kindInfoVo = buildKindInfoVo(quoteVo.getKindInfoVo(), calculationPremium.getBi().getPrptitemkindList());
-            quoteVo.getBiRiskInfoVo().setStartDate(calculationPremium.getBi().getPrptitemkindList().get(0).getStartDate() + " 00:00:00");
-            quoteVo.getBiRiskInfoVo().setEndDate(calculationPremium.getBi().getPrptitemkindList().get(0).getEndDate() + " 00:00:00");
             quoteResultsVo.setKindInfoVo(kindInfoVo);
         }
-        quoteResultsVo.setBiRiskInfoVo(quoteVo.getBiRiskInfoVo());
 
 
         QuoteResultsVo.ScoreVo scoreVo = new QuoteResultsVo.ScoreVo();

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/service/impl/GuoRenCrawlerRequestImpl.java

@@ -132,20 +132,35 @@ public class GuoRenCrawlerRequestImpl implements GuoRenCrawlerRequest {
                 }
                 String startDate = TimeProcessing.dateTimeToDate(startTime);
                 String endDate = TimeProcessing.dateTimeToDate(endTime);
+
                 // 交强
+                quoteVo.getCiRiskInfoVo().setStartDate(startTime);
+                quoteVo.getCiRiskInfoVo().setEndDate(endTime);
                 crawlerCalculationPremiumRequest.getCi().getPrpTmain().setStartDate(startDate);
+                crawlerCalculationPremiumRequest.getCi().getPrpTmain().setStartHour(TimeProcessing.getHour(startTime));
+                crawlerCalculationPremiumRequest.getCi().getPrpTmain().setStartMinute(TimeProcessing.getMinute(startTime));
                 crawlerCalculationPremiumRequest.getCi().getPrpTmain().setEndDate(endDate);
+                crawlerCalculationPremiumRequest.getCi().getPrpTmain().setEndHour(TimeProcessing.getHour(endTime));
+                crawlerCalculationPremiumRequest.getCi().getPrpTmain().setEndMinute(TimeProcessing.getMinute(endTime));
                 crawlerCalculationPremiumRequest.getCi().getPrptitemkindList().forEach(item -> {
                     item.setStartDate(startDate);
                     item.setEndDate(endDate);
                 });
                 if (crawlerCalculationPremiumRequest.getBi().getPrpTmain() != null) {
                     // 商业
-                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setStartDate(startDate);
-                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setEndDate(endDate);
+                    String biStartDate = TimeProcessing.plusDays(startDate, 1);
+                    String biEndDate = TimeProcessing.plusDays(endDate, 1);
+                    quoteVo.getBiRiskInfoVo().setStartDate(biStartDate + " 00:00:00");
+                    quoteVo.getBiRiskInfoVo().setEndDate(biEndDate + " 00:00:00");
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setStartDate(biStartDate);
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setStartHour(0);
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setStartMinute(0);
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setEndDate(biEndDate);
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setEndHour(24);
+                    crawlerCalculationPremiumRequest.getBi().getPrpTmain().setEndMinute(0);
                     crawlerCalculationPremiumRequest.getBi().getPrptitemkindList().forEach(item -> {
-                        item.setStartDate(startDate);
-                        item.setEndDate(endDate);
+                        item.setStartDate(biStartDate);
+                        item.setEndDate(biEndDate);
                     });
                 }
                 calculationPremium = guoRenCrawlerRequestComponent.calculationPremium(crawlerCalculationPremiumRequest, headers);