调整泰康交强险时间与保司时间不一致问题；返回报价折扣信息

commons/src/main/java/com/jzg/commons/util/DateTimeUtils.java

@@ -78,7 +78,7 @@ public class DateTimeUtils {
         int m = Integer.parseInt(minute);
 
         LocalDateTime dateTime;
-        if (h == 24 && m == 0) {
+        if (h == 24) {
             // 24:00 转换为当天 23:59:59
             dateTime = date.atTime(23, 59, 59);
         } else {

tenant/insurance/quotation-taikang/src/main/java/com/jzg/quotation/taikang/crawler/build/TkCrawlerQuoteResultsBuild.java

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -77,7 +78,7 @@ public class TkCrawlerQuoteResultsBuild {
         // 交强险
         RiskInfoVo riskInfoVo1 = new RiskInfoVo();
         LocalDateTime jyStart = DateTimeUtil.parseLocalDateTime(date.getInitStartDateBZ(), DateTimeUtil.DATETIME_PATTERN_EXT1);
-        riskInfoVo1.setStartDate(DateTimeUtil.getStartTimeOfDayStr(jyStart, DateTimeUtil.DATETIME_PATTERN));
+        riskInfoVo1.setStartDate(jyStart.format(DateTimeFormatter.ofPattern(DateTimeUtil.DATETIME_PATTERN)));
         riskInfoVo1.setEndDate(DateTimeUtils.convertToDateTime(date.getJqEndDate(), date.getJqEndHour(), date.getJqEndMinute()));
         quoteResultsVo.setCiRiskInfoVo(riskInfoVo1);
 
@@ -85,7 +86,7 @@ public class TkCrawlerQuoteResultsBuild {
         if (commonQuoteVo.getBiRiskInfoVo() != null) {
             RiskInfoVo riskInfoVo2 = new RiskInfoVo();
             LocalDateTime syStart = DateTimeUtil.parseLocalDateTime(date.getInitStartDateCI(), DateTimeUtil.DATETIME_PATTERN_EXT1);
-            riskInfoVo2.setStartDate(DateTimeUtil.getStartTimeOfDayStr(syStart, DateTimeUtil.DATETIME_PATTERN));
+            riskInfoVo2.setStartDate(syStart.format(DateTimeFormatter.ofPattern(DateTimeUtil.DATETIME_PATTERN)));
             riskInfoVo2.setEndDate(DateTimeUtils.convertToDateTime(date.getSyEndDate(), date.getSyEndHour(), date.getSyEndMinute()));
             quoteResultsVo.setBiRiskInfoVo(riskInfoVo2);
         }
@@ -135,6 +136,9 @@ public class TkCrawlerQuoteResultsBuild {
         BigDecimal vv = preciseInitResult.getCarTax().getSumPayment() == null ? BigDecimal.ZERO : preciseInitResult.getCarTax().getSumPayment();
         BigDecimal total = ci.add(bi).add(vv);
         quoteResultsVo.getCosts().setSumPremium(total.toPlainString());
+        // 折扣
+        quoteResultsVo.getScoreVo().setJqAdjustRate(preciseInitResult.getCiDisCount() != null ? preciseInitResult.getCiDisCount().toString() : null);
+        quoteResultsVo.getScoreVo().setSyAdjustRate(preciseInitResult.getBzDisCount() != null ? preciseInitResult.getBzDisCount().toString() : null);
         // 设置订单状态
         quoteResultsVo.setQuoteStatusEnum(InsOrderStatusEnum.WAIT_AUDIT);
         // 缓存报价书据数据