诚泰修改

src/main/java/com/ydtech/modules/order/service/impl/ChengTaiOrderApiServiceImpl.java

@@ -292,33 +292,35 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
                 ? premiumCalculationResponse.getCommRisk().getBasePart().getQuestion()
                 : null;
         // 订单号
-        String orderNumber = premiumCalculationResponse.getCompRisk() != null
-                ? premiumCalculationResponse.getCompRisk().getFtrno().getOrderNumber()
-                : premiumCalculationResponse.getCommRisk().getFtrno().getOrderNumber();
-        Map<String, String> bodyMap = new HashMap<>();
-        if (Objects.nonNull(ciQuestion)) {
-            bodyMap.put("jqImage", ciQuestion);
-        }
-        if (Objects.nonNull(biQuestion)) {
-            bodyMap.put("syImage", biQuestion);
-        }
-        String sendBody = JsonUtils.toJson(bodyMap);
-        if (!"{}".equals(sendBody)) {
-            String ocrStr = HttpUtil.sendPost("http://39.98.41.104:8088/getres", sendBody);
-            CheckCodeResp resp = JSONUtil.toBean(ocrStr, CheckCodeResp.class);
-            quoteVo.setRenewalCodeJq(resp.getJqImageCode());
-            quoteVo.setRenewalCodeSy(resp.getSyImageCode());
-            premiumCalculationRequest = new PremiumCalculationRequest(quoteInfoVo,carActualValue,parameters,vehicle,quoteVo,quoteInfoVo.getRiskList(),orderNumber);
-            premiumCalculationResponse = chengTaiRequestApiComponent.premiumCalculation(premiumCalculationRequest);
-            maxQuoteNum--;
-            SysQuoteRecord sysQuoteRecord = new SysQuoteRecord(quoteInfoVo.getUserid(),quoteVo.getCompanyId(),quoteInfoVo.getCarInfo().getLicenseNo(),
-                    QuoteNumberConstant.QuoteAction.DATE_DEAL.getCode().toString(),QuoteNumberConstant.QuoteResult.FAIL.getCode().toString());
-            sysQuoteRecords.add(sysQuoteRecord);
-            if(maxQuoteNum <= 0){
-                sysQuoteRecordMapper.insertBatch(sysQuoteRecords);
-                //刷新redis中的报价次数
-                sysQuoteRedisService.refreshQuoteNum(quoteVo.getCompanyId(),quoteInfoVo.getUserid(),sysQuoteRecords);
-                throw new SystemException("报价次数限制");
+        if (ciQuestion!= null || biQuestion != null) {
+            String orderNumber = premiumCalculationResponse.getCompRisk() != null
+                    ? premiumCalculationResponse.getCompRisk().getFtrno().getOrderNumber()
+                    : premiumCalculationResponse.getCommRisk().getFtrno().getOrderNumber();
+            Map<String, String> bodyMap = new HashMap<>();
+            if (Objects.nonNull(ciQuestion)) {
+                bodyMap.put("jqImage", ciQuestion);
+            }
+            if (Objects.nonNull(biQuestion)) {
+                bodyMap.put("syImage", biQuestion);
+            }
+            String sendBody = JsonUtils.toJson(bodyMap);
+            if (!"{}".equals(sendBody)) {
+                String ocrStr = HttpUtil.sendPost("http://39.98.41.104:8088/getres", sendBody);
+                CheckCodeResp resp = JSONUtil.toBean(ocrStr, CheckCodeResp.class);
+                quoteVo.setRenewalCodeJq(resp.getJqImageCode());
+                quoteVo.setRenewalCodeSy(resp.getSyImageCode());
+                premiumCalculationRequest = new PremiumCalculationRequest(quoteInfoVo,carActualValue,parameters,vehicle,quoteVo,quoteInfoVo.getRiskList(),orderNumber);
+                premiumCalculationResponse = chengTaiRequestApiComponent.premiumCalculation(premiumCalculationRequest);
+                maxQuoteNum--;
+                SysQuoteRecord sysQuoteRecord = new SysQuoteRecord(quoteInfoVo.getUserid(),quoteVo.getCompanyId(),quoteInfoVo.getCarInfo().getLicenseNo(),
+                        QuoteNumberConstant.QuoteAction.DATE_DEAL.getCode().toString(),QuoteNumberConstant.QuoteResult.FAIL.getCode().toString());
+                sysQuoteRecords.add(sysQuoteRecord);
+                if(maxQuoteNum <= 0){
+                    sysQuoteRecordMapper.insertBatch(sysQuoteRecords);
+                    //刷新redis中的报价次数
+                    sysQuoteRedisService.refreshQuoteNum(quoteVo.getCompanyId(),quoteInfoVo.getUserid(),sysQuoteRecords);
+                    throw new SystemException("报价次数限制");
+                }
             }
         }
         return premiumCalculationResponse;
@@ -400,18 +402,18 @@ public class ChengTaiOrderApiServiceImpl implements ChengTaiOrderApiService {
         final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
         for (QuoteRiskRespVo quoteRiskRespVo : riskList1) {
             // 时间格式转换
-            OffsetDateTime startDateTime = OffsetDateTime.parse(quoteRiskRespVo.getStartDate());
-            OffsetDateTime endDateTime = OffsetDateTime.parse(quoteRiskRespVo.getEndDate());
-
-            String startDateStr = startDateTime.format(FORMATTER);
-            String endDateStr = endDateTime.format(FORMATTER);
+//            OffsetDateTime startDateTime = OffsetDateTime.parse(quoteRiskRespVo.getStartDate());
+//            OffsetDateTime endDateTime = OffsetDateTime.parse(quoteRiskRespVo.getEndDate());
+//
+//            String startDateStr = startDateTime.format(FORMATTER);
+//            String endDateStr = endDateTime.format(FORMATTER);
 
             if (InsuranceRisk.TRAFFIC.getCode().equals(quoteRiskRespVo.getRiskCode())) {
-                quoteRespVo.setStartDateJq(startDateStr);
-                quoteRespVo.setEndDateJq(endDateStr);
+                quoteRespVo.setStartDateJq(quoteRiskRespVo.getStartDate());
+                quoteRespVo.setEndDateJq(quoteRiskRespVo.getEndDate());
             } else if (InsuranceRisk.BUSINESS.getCode().equals(quoteRiskRespVo.getRiskCode())) {
-                quoteRespVo.setStartDateSy(startDateStr);
-                quoteRespVo.setEndDateSy(endDateStr);
+                quoteRespVo.setStartDateSy(quoteRiskRespVo.getStartDate());
+                quoteRespVo.setEndDateSy(quoteRiskRespVo.getEndDate());
             }
         }
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();