Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/ins/model/yc/YcBuildData.java

@@ -261,14 +261,12 @@ public class YcBuildData {
 
         //保费合计
         double sumPermium = StringUtils.toDouble(rd.getBase().getNPrm());
-        ;
-
 
 
         quoteRespVo.setCiSumPermium(BigDecimal.valueOf(jqPremium).add(BigDecimal.valueOf(sumTax)).doubleValue());//交强险和车船税合计
         quoteRespVo.setSumPermium(BigDecimal.valueOf(sumPermium).add(BigDecimal.valueOf(sumTax)).doubleValue());//保费合计
         quoteRespVo.setTaxAmount(BigDecimal.valueOf(sumTax).doubleValue());//车船税
-        if(null != rd.getPrmCoef()){
+        if (null != rd.getPrmCoef()) {
             quoteRespVo.setTotalAdjustRate(StringUtils.toDouble(rd.getPrmCoef().getNTotDisc()));
         }
         quoteRespVo.setILogPreUdwMess(rd.getBase().getCWeRisk());//评分
@@ -284,40 +282,43 @@ public class YcBuildData {
         quoteRespVo.setEndDateSy(StringUtils.toString(rd.getBase().getTInsrncEndTmSY()));
 
 
+        //交强险出险字符串
+        StringBuffer ciSB = new StringBuffer("交强险-");
+        //商业险出险字符串
+        StringBuffer biSB = new StringBuffer("商业险-");
+        if (null != rd.getVehicleAdjust()) {
+            //交强险过往出险记录
+            String jQRecordDanger = StringUtils.toString(rd.getVehicleAdjust().getJQRecordDanger(),"");
+            ciSB.append("交强险过往出险记录：");
+            ciSB.append(jQRecordDanger);
+        }
 
-        //出险信息
-        if(null != rd.getPrmCoef()){
-            //连续承保期间出险次数
+        if (null != rd.getPrmCoef()) {
+            //商业险   连续承保期间出险次数
             int nClaimTimes = StringUtils.toInt(rd.getPrmCoef().getNClaimTimes());
-            //连续承保年数
-            int nInsureYears = StringUtils.toInt(rd.getPrmCoef().getNInsureYears());
-    //        String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears);
-            quoteRespVo.setAccidentInfoStr(String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears));
+            biSB.append("连续承保期间出险次数：");
+            biSB.append(nClaimTimes);
+
+//            //连续承保年数
+//            int nInsureYears = StringUtils.toInt(rd.getPrmCoef().getNInsureYears());
+            //        String.format("连续承保期间出险次数 %s ,连续承保年数 %s",nClaimTimes,nInsureYears);
         }
 
+        //出险信息
+        quoteRespVo.setAccidentInfoStr(String.format("%s , %s", ciSB.toString(), biSB.toString()));
+
         //平台返回信息
-        if(null != rd.getTfiWarnList()){
+        if (null != rd.getTfiWarnList()) {
             //排空
             List<TfiWarnListResponse.TfiWarnData> tfiWarnData = rd.getTfiWarnList().getTfiWarnData().stream().filter(item -> null != item).filter(item -> StringUtils.isNotEmpty(item.getWarnMessage())).collect(Collectors.toList());
             List<String> warnMessageList = new ArrayList<>();
-            tfiWarnData.stream().forEach(a ->{
+            tfiWarnData.stream().forEach(a -> {
                 warnMessageList.add(a.getWarnMessage());
             });
             quoteRespVo.setWarnMessageList(warnMessageList);
         }
 
 
-
-        //@TODO 真假单交需要确认
-//        List<ExtendInfoDto> extendInfo = responseBodyC2.getExtendInfo();
-////        Map<String, String> maps = extendInfo.stream().collect(Collectors.toMap(ExtendInfoDto::getKey,ExtendInfoDto::getValue , (key1, key2) -> key2));
-//        Map<String, String> maps = extendInfo.stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()), LinkedHashMap::putAll);
-//        String relationType = maps.get("relationType");
-//        quoteRespVo.setIszdj("0");
-//        if ("7".equals(relationType)) {
-//            quoteRespVo.setIszdj("1");
-//        }
-
         return quoteRespVo;
     }
 

src/main/java/com/ydtech/modules/ins/scheduler/InsOrderScheduler.java

@@ -41,28 +41,45 @@ public class InsOrderScheduler {
     HengbangService hengbangService;
     @Resource
     InsAlltrustApiService insYongchengApiService;
+    @Resource
+    InsGuoRenApiService insGuoRenApiService;
 
 
 
+//    /**
+//     * 永诚定时任务
+//     * 补传回调
+//     * 每隔300秒执行
+//     * fixedRate / 1000  = 秒
+//     *
+//     * #：0 0/5 7,22 * * ?  7点到22点 每隔5分钟执行
+//     *
+//     */
+////    @Scheduled(fixedRate = 300000)
+////    @Scheduled(cron = "0 0/5 7,22 * * ? ")
+//    @Scheduled(cron = "0 0/5 * * * ?")
+//    public void alltrustCallbackTask() {
+////        logger.info("【定时任务执行 - 永城 - 补传回调】开始时间：" + dateFormat.format(new Date()) + "");
+//
+//        insYongchengApiService.callbackAnOrder();
+//
+////        logger.info("【定时任务执行 - 永城 - 补传回调】结束时间：" + dateFormat.format(new Date())+ "" );
+//    }
+
+
     /**
-     * 永诚定时任务
-     * 补传回调
+     * 国任定时任务
+     * 投保单状态查询
      * 每隔300秒执行
-     * fixedRate / 1000  = 秒
      *
      * #：0 0/5 7,22 * * ?  7点到22点 每隔5分钟执行
      *
      */
-//    @Scheduled(fixedRate = 300000)
-//    @Scheduled(cron = "0 0/5 7,22 * * ? ")
-    @Scheduled(cron = "0 0/5 * * * ?")
-    public void alltrustCallbackTask() {
-//        logger.info("【定时任务执行 - 永城 - 补传回调】开始时间：" + dateFormat.format(new Date()) + "");
-
-        insYongchengApiService.callbackAnOrder();
-
-//        logger.info("【定时任务执行 - 永城 - 补传回调】结束时间：" + dateFormat.format(new Date())+ "" );
-    }
+//    @Scheduled(cron = "0 0/1 7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22 * * ? ")
+//    @Scheduled(cron = "0 0/1 * * * ?")
+//    public void GuoRenInsOrderStatusTask() {
+//        insGuoRenApiService.toBePaidOrderStatus();
+//    }
 
 
 //    /**

src/main/java/com/ydtech/modules/ins/service/impl/InsAlltrustApiServiceImpl.java

@@ -316,14 +316,6 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                 textHead += " - 转保处理 ";
                 continue;
             }
-//            if(isRenewal){
-//                //2、转保处理
-//                boo = reinsurance(rr, m);
-//                if (!boo) {
-//                    isRenewal = false;
-//                    continue;
-//                }
-//            }
 
             if (isBiRepeat) {
                 //3、商业险日期处理
@@ -344,29 +336,10 @@ public class InsAlltrustApiServiceImpl implements InsAlltrustApiService {
                 continue;
             }
 
-
         }
         if (null == rr) return HttpResult.error("远程请求报价失败");
         if (!rr.getHead().getErrorCode().equals("000000")) return HttpResult.error(rr.getHead().getErrorMessage());
 
-
-//        RuoteResponse rr = requestApi(m, new RuoteResponse(), iac, YcBuildData.API_QUOTE, InsQuoteFlow.Q_S_0);
-//        if (null == rr) return HttpResult.error("远程请求报价失败");
-//        if (!rr.getHead().getErrorCode().equals("000000")) return HttpResult.error(rr.getHead().getErrorMessage());
-//        RuoteResponse rr2 = quoteExternalApi(rr, quoteVo, iac, m);
-//        if (!rr2.getHead().getErrorCode().equals("000000")) return HttpResult.error(rr2.getHead().getErrorMessage());
-
-
-//        if (!rr2.getHead().getErrorCode().equals("009999")) {
-//            int index1 = rr2.getHead().getErrorMessage().indexOf("起保日期");
-//            int index2 = rr2.getHead().getErrorMessage().indexOf("终保日期");
-//            if(rr2.getHead().getErrorMessage().contains("重复投保") && rr2.getHead().getErrorMessage().contains("起保日期")){
-//                rr2.getHead().getErrorMessage().substring(index1,index1 + 16);
-//
-//            }
-//
-//        }
-
         QuoteRespVo quoteRespVo = YcBuildData.buildQuoteRespVo(order, rr, yaQuoteInfoVo);
         //8 生成订单
         iac = response_order(order, quoteRespVo, m, rr, quoteVo);