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

src/main/java/com/ydtech/config/properties/ZmApiConfigurationProperties.java

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 /**
  * @author wenks
  * @version 0.0.2
- * @description TODO
+ * @description 中煤API对接参数
  * @date 2023/4/20 18:01
  */
 
@@ -28,13 +28,15 @@ public class ZmApiConfigurationProperties {
     private String smsUrl;
     // 支付完成页面跳转地址
     private String pageUrl;
-    //
+    // 回调前缀
     private String callbackDomain;
     // 承保回调地址
     private String callbackUrl;
     // 审核回调地址
     private String passMsgUrl;
 
+
+
     /**
      * 中煤请求 head 的参数
      *

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

@@ -764,32 +764,6 @@ public class YongAnServiceImpl implements YongAnService {
             insAreaCompanyService.updateById(insAreaCompany);
             insOrdersService.updateByOrderStatus(insAreaCompany.getOrderno(), insAreaCompany.getOrderstatus());
 
-//            //插入轨迹表
-//            InsTaskHistory history6 = new InsTaskHistory();
-//            history6.setId(String.valueOf(new Date().getTime()));
-//            history6.setCompany(order.getInscompany());
-//            history6.setTaskid(order.getOrderno());
-//            history6.setOperatorid(order.getUserid());
-//            history6.setOperator(order.getUsername());
-//            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-//            history6.setCreatetime(sdf.format(new Date()));
-//            history6.setStatus("6");
-//            history6.setRemark("已缴费");
-//            insTaskHistoryService.insert(history6);
-//            //
-//            orderComponents.saveFeeDetail(order);
-//            //插入轨迹表
-//            InsTaskHistory history7 = new InsTaskHistory();
-//            history7.setId(String.valueOf(new Date().getTime()));
-//            history7.setCompany(order.getInscompany());
-//            history7.setTaskid(order.getOrderno());
-//            history7.setOperatorid(order.getUserid());
-//            history7.setOperator(order.getUsername());
-//            history7.setCreatetime(sdf.format(new Date()));
-//            history7.setStatus("7");
-//            history7.setRemark("已承保");
-//            insTaskHistoryService.insert(history7);
-
         } else {
             log.error("生成保单失败：crstTxt--" + crstTxt + "||crstMsg--" + crstMsg);
         }

src/main/java/com/ydtech/modules/order/controller/CarModelController.java

@@ -25,8 +25,6 @@ public class CarModelController {
     @GetMapping("/vinSearch")
     @ApiOperation("vin码查询")
     public HttpResult vinSearch(@RequestParam String frameNo) {
-
-//        return  insPinganService.vinSearch(frameNo);
         return carModelService.vinSearch(frameNo);
     }
 

src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -101,8 +101,7 @@ public class InsOrdersController {
     @PostMapping("/getByCompanyId")
     @ApiOperation(value = "通过子订单查询订单信息")
     public HttpResult getByCompanyId(@RequestSingleParam(value = "companyId") String companyId) {
-        HttpResult httpResult = this.insOrdersService.getByCompanyId(companyId);
-        return httpResult;
+        return this.insOrdersService.getByCompanyId(companyId);
     }
 
     @PostMapping("/getAccidentalDriving")
@@ -113,7 +112,7 @@ public class InsOrdersController {
                 .and(i -> i.eq("seat_num_max", accidentalDrivingVo.getSeatNum()).or(j -> j.le("seat_num_max", accidentalDrivingVo.getSeatNum()).ge("seat_num_min", accidentalDrivingVo.getSeatNum())))
                 .list();
 
-        if (insAccidentalDrivings.size() == 0) {
+        if (insAccidentalDrivings.isEmpty()) {
             throw new SystemException("查询结果为空");
         }
         return HttpResult.ok(insAccidentalDrivings);

src/main/java/com/ydtech/modules/order/entity/api/zm/constants/InsuranceTypeCorrespondence.java

@@ -11,6 +11,9 @@ import java.util.Map;
  */
 public class InsuranceTypeCorrespondence {
 
+    private InsuranceTypeCorrespondence() {
+    }
+
     public static final String[] JINZHANGGUI_TYPE = {"A", "B", "D3", "D4", "MJ1", "MJ2", "MJ3", "MJ4", "BD", "L", "SY_FJ_YBW1", "SY_FJ_YBW2", "SY_FJ_YBW3"};
 
     public static final String[] CONNECT_INSURANCE_TYPE = {"01", "02", "041", "044", "501", "502", "5041", "5044", "49", "21", "5302", "5344", "5341"};
@@ -29,7 +32,7 @@ public class InsuranceTypeCorrespondence {
     public static final String TRAFFIC = "0507";
     public static final String BUSINESS = "0510";
 
-    public final static Map<String, String> RISK = new HashMap<>();
+    public static final Map<String, String> RISK = new HashMap<>();
 
     static {
         RISK.put("0507", "0330");

src/main/java/com/ydtech/modules/order/entity/api/zm/constants/TimeConstants.java

@@ -6,10 +6,10 @@ package com.ydtech.modules.order.entity.api.zm.constants;
  * @description TODO
  * @date 2023/4/23 14:15
  */
-public class TimeConstants {
+public interface TimeConstants {
 
-    public static final String START_TIME = "00:00:00";
+     String START_TIME = "00:00:00";
 
-    public static final String END_TIME = "23:59:59";
+     String END_TIME = "23:59:59";
 
 }

src/main/java/com/ydtech/modules/order/entity/api/zm/constants/TransCode.java

@@ -6,30 +6,30 @@ package com.ydtech.modules.order.entity.api.zm.constants;
  * @description 交互代码
  * @date 2023/4/25 16:54
  */
-public class TransCode {
+public interface TransCode {
 
     //车型查询
-    public static final String MODELS_QUERY = "ModelsQuery";
+     String MODELS_QUERY = "ModelsQuery";
     //报价
-    public static final String QUOTE_PRICE = "QuotedPrice";
+     String QUOTE_PRICE = "QuotedPrice";
     //提交核保
-    public static final String SUBMIT = "Submit";
+     String SUBMIT = "Submit";
     //缴费查询
-    public static final String ORDER_STATUS = "OrderStatus";
+     String ORDER_STATUS = "OrderStatus";
     //投保单核保状态查询
-    public static final String SUBMIT_STATUS_QUERY = "SubmitStatusQuery";
+     String SUBMIT_STATUS_QUERY = "SubmitStatusQuery";
 
     // 投保单核保状态 url 参数
-    public static final String SUBMIT_STATUS = "SubmitStatus";
+     String SUBMIT_STATUS = "SubmitStatus";
     //电子保单下载
-    public static final String INSURANCE_POLICY_PRINT = "InsurancePolicyPrint";
+     String INSURANCE_POLICY_PRINT = "InsurancePolicyPrint";
     //影像上传
-    public static final String UPLOAD_IMAGE = "UploadImage";
+     String UPLOAD_IMAGE = "UploadImage";
     //校验是否发送短信验证码
-    public static final String CHECK_SMS_CODE = "CheckSMScode";
+     String CHECK_SMS_CODE = "CheckSMScode";
     //校验验证码是否正确
-    public static final String VALID_SMS_CODE = "ValidSMScode";
+     String VALID_SMS_CODE = "ValidSMScode";
     //续保查询
-    public static final String RenewalQuery = "RenewalQuery";
+     String RenewalQuery = "RenewalQuery";
 
 }

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

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ydtech.components.AnShengRequestComponents;
 import com.ydtech.constants.enums.InsOrderStatus;
 import com.ydtech.core.page.HttpResult;
@@ -91,7 +90,6 @@ public class AnShengOrderServiceImpl implements AnShengOrderService {
         // 2. 获取订单
 
         if (body.getCode() == 400) {
-//            insTaskHistoryComponents.modifyStatus(InsTaskHistoryEnum.UNDERWRITING_FAILED, order);
             return HttpResult.error("安盛天平--核保失败：" + body.getMessage());
         }
 
@@ -144,14 +142,14 @@ public class AnShengOrderServiceImpl implements AnShengOrderService {
         InsAreaCompany insAreaCompany = new InsAreaCompany();
         insAreaCompany.setId(IdGenerate.nextId());
         insAreaCompany.setOrderno(orderNo);
-        insAreaCompany.setReptxt(JSONObject.parseObject(JSONObject.toJSONString(response)));
+        insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(response)));
         insAreaCompany.setJqpremium(BigDecimal.valueOf(response.getForceCarInsureRisk()));
         insAreaCompany.setSypremium(BigDecimal.valueOf(response.getBusiTotalPremium()));
         insAreaCompany.setTaxamount(BigDecimal.valueOf(response.getCarInsureShiptax()));
         insAreaCompany.setSumpremium(BigDecimal.valueOf(response.getCarInsureMain()));
         insAreaCompany.setOrderstatus(InsOrderStatus.S_0.getCode()); // 1
-        insAreaCompany.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-        insAreaCompany.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
+        insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
+        insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
         insAreaCompany.setCompanyId(esmInsCompany.getId());
         insAreaCompany.setInscompany(esmInsCompany.getNamesimple());
         insAreaCompanyService.save(insAreaCompany);
@@ -221,7 +219,7 @@ public class AnShengOrderServiceImpl implements AnShengOrderService {
 
     public AsLoginInfoCache getLoginInfo(String orderNo) {
         String s = redisTemplate.opsForValue().get(INS_ANSHENG_KEY + orderNo);
-        return JSONObject.parseObject(s, AsLoginInfoCache.class);
+        return JSON.parseObject(s, AsLoginInfoCache.class);
     }
 
 

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

@@ -6,7 +6,6 @@ import com.ydtech.modules.order.service.CarModelService;
 import com.ydtech.modules.order.service.InsOrdersService;
 import com.ydtech.modules.order.service.YongAnOrderService;
 import com.ydtech.modules.order.service.ZhongMeiOrderService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 

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

@@ -84,6 +84,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
     }
 
+
+
+
     @Override
     public List<CarModelDTO> vinSearch(String vin) {
         LambdaQueryWrapper<InsOrders> wrapper = new LambdaQueryWrapper<>();

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

@@ -1,5 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -39,7 +40,6 @@ import org.springframework.util.StringUtils;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -49,13 +49,13 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     String url = "";
 
     @Value("${ya.url.sign}")
-    String url_sign = "";
+    String urlSign = "";
 
     @Value("${ya.consumerID}")
     String consumerID = "";
 
     @Value("${ya.consumerAccessKey}")
-    String consumerAccessKey_init = "";
+    String consumerAccessKeyInit = "";
 
     @Value("${ya.matchCode}")
     String matchCode = "";
@@ -93,7 +93,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         try {
             ResponseDataC1 responseDataC1 = getResponseDataC1(carModelReq);
             List<CarModelDTO> carModel = responseDataC1.getResponseBody().getCarModel();
-            if (carModel.size() > 0) {
+            if (!carModel.isEmpty()) {
                 return carModel;
             }
         } catch (Exception ignored) {
@@ -140,20 +140,6 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             carModelReq.setEngineNo(carInfo.getEngineNo()); //发动机号
             ResponseDataC1 responseDataC1 = getResponseDataC1(carModelReq);
 
-            // 校验车型 车型年份大于初等日期
-            if (responseDataC1.getResponseBody().getCarModel().size() == 1) {
-                CarModelDTO carModelDTO2 = responseDataC1.getResponseBody().getCarModel().get(0);
-                String year = carModelDTO2.getMarketYear().substring(0, 6);
-                String registerDate = carInfo.getRegisterDate();
-                String registerYear = registerDate.replace("-", "").substring(0, 6);
-                if (Integer.parseInt(year) > Integer.parseInt(registerYear)) {
-                    carModelReq = new CarModel_Req();
-                    carModelReq.setEnrollDate(carInfo.getRegisterDate()); // 初登日期
-                    carModelReq.setModelName(carInfo.getModelcname());
-                    responseDataC1 = getResponseDataC1(carModelReq);
-                }
-            }
-
             // 无法通过车架号查出车型 通过车型查询
             if ("100001".equals(responseDataC1.getResponseHead().getAppCode())) {
                 carModelReq.setModelName(carInfo.getModelcname());
@@ -738,7 +724,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         RequestHead requestHead = new RequestHead();
         requestHead.setSeqNo(geneReqNo());
         requestHead.setConsumerID(consumerID);
-        requestHead.setConsumerAccessKey(consumerAccessKey_init);
+        requestHead.setConsumerAccessKey(consumerAccessKeyInit);
         requestHead.setTransCode(type);
         requestHead.setRegionCode("D");
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -795,7 +781,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     public String getConsumerAccessKey(String xmlString) throws Exception {
         String consumerAccessKey = "";
         xmlString = xmlString.substring(xmlString.lastIndexOf("<requestBody>") + 13, xmlString.lastIndexOf("</requestBody>"));
-        consumerAccessKey = HMAC256Uitil.hmac256(xmlString, consumerAccessKey_init);
+        consumerAccessKey = HMAC256Uitil.hmac256(xmlString, consumerAccessKeyInit);
         return consumerAccessKey;
     }
 
@@ -813,7 +799,6 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             KindInfoVo kindInfoVo = kindList.get(j);
             String deductibleRate = kindInfoVo.getDeductibleRate();
 
-
             //第三者责任险
             if (kindList.get(j).getKindCode().equals("B")) {
                 KindDTO kindInfo = new KindDTO();
@@ -1126,20 +1111,20 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             insAreaCompany.setOrderno(orderNo);
             //报价成功更新险种信息
             ResponseBodyC2 responseBody = responseDataC2.getResponseBody();
-            insAreaCompany.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
-            insAreaCompany.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
+            insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
+            insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
             insAreaCompany.setJqpremium(BigDecimal.valueOf(jq_falg ? responseBody.getCiPremium() : 0));
             insAreaCompany.setSypremium(BigDecimal.valueOf(responseBody.getBiPremium()));
             insAreaCompany.setTaxamount(BigDecimal.valueOf(jq_falg ? responseBody.getCarTax().getSumPayment() : 0));
 //            insOrder.setSumpremium(responseBody.getSumPremium()+insOrder.getTaxamount());
             insAreaCompany.setSumpremium(BigDecimal.valueOf(quoteRespVo.getSumPermium()));
             insAreaCompany.setOrderstatus(InsOrderStatus.S_0.getCode()); // 1
-            insAreaCompany.setReqtxt(JSONObject.parseObject(JSONObject.toJSONString(requestData)));
-            insAreaCompany.setReptxt(JSONObject.parseObject(JSONObject.toJSONString(responseDataC2)));
+            insAreaCompany.setReqtxt(JSON.parseObject(JSON.toJSONString(requestData)));
+            insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseDataC2)));
 //            insAreaCompany.setPolicytype(quoteRespVo.getIszdj());
             insAreaCompany.setInscompany(esmInsCompany.getId());
             insAreaCompany.setInscompany(esmInsCompany.getNamesimple());
-            insAreaCompany.setTaxArrears(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getTaxArrears())));
+            insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(quoteRespVo.getTaxArrears())));
             insAreaCompanyService.save(insAreaCompany);
             insOrdersService.updateByOrderStatus(orderNo, InsOrderStatus.S_0.getCode());
             quoteRespVo.setCompanyId(insAreaCompany.getId());

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

@@ -189,7 +189,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
     @Override
     public HttpResult paymentEnquiry(String companyId) {
         InsAreaCompany insAreaCompany = insAreaCompanyService.getByInsOrderNo(companyId);
-        if(insAreaCompany.getOrderstatus().equals(InsOrderStatus.S_3.getCode())){
+        if (insAreaCompany.getOrderstatus().equals(InsOrderStatus.S_3.getCode())) {
             return HttpResult.ok("此订单已承保");
         }
         OrderStatusRequest orderStatusRequest = new OrderStatusRequest();
@@ -197,7 +197,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         orderStatusRequest.setSubProposalNo(insAreaCompany.getInsOrderNo());
         OrderStatusResponse orderStatusResponse = zhongmeiRequestApiComponents.orderStatus(orderStatusRequest, OrderStatusResponse.class);
         String status = orderStatusResponse.getStatus();
-        if(status.equals(PaymentStatusEnum.P_3.getCode())){
+        if (status.equals(PaymentStatusEnum.P_3.getCode())) {
             insAreaCompany.setJqpolicyno(orderStatusResponse.getSubContractNoJ());
             insAreaCompany.setSypolicyno(orderStatusResponse.getSubContractNoS());
             insAreaCompany.setJypolicyno(orderStatusResponse.getAccidentNo());
@@ -254,8 +254,16 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
     }
 
     public QuoteRespVo getQuoteRespVo(QuotedPriceResponse quotedPriceResponse, BaseQuoteInfoVo yaQuoteInfoVo) {
-        double jqPremium = quotedPriceResponse.getForcePrimium().getPremium();
-        double syPremium = quotedPriceResponse.getBizPremium().getSumPremium();
+        double jqPremium = 0;
+        double syPremium = 0;
+
+        if (!ObjectUtils.isEmpty(quotedPriceResponse.getForcePrimium())) {
+            jqPremium = quotedPriceResponse.getForcePrimium().getPremium();
+        }
+        if (!ObjectUtils.isEmpty(quotedPriceResponse.getBizPremium())) {
+            syPremium = quotedPriceResponse.getBizPremium().getSumPremium();
+        }
+
         QuoteRespVo quoteRespVo = new QuoteRespVo();
         List<QuoteRiskRespVo> riskList1 = new ArrayList<>();
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
@@ -282,26 +290,29 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         }
 
         QuoteKindRespVo kind;
-        List<QuotedPriceResponse.BizPremiumDTO.CoverageListDTO> coverageList = quotedPriceResponse.getBizPremium().getCoverageList();
-        List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
-
-        for (KindInfoVo kindInfoVo : kindList) {
-            kind = new QuoteKindRespVo();
-            kind.setKindCode(kindInfoVo.getKindCode());
-            kind.setKindName(kindInfoVo.getKindName());
-            kind.setAmount(kindInfoVo.getAmount());
-            int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.JINZHANGGUI_TYPE, kindInfoVo.getKindCode());
-
-            QuotedPriceResponse.BizPremiumDTO.CoverageListDTO coverageListDTOS = coverageList.stream().filter(
-                            a -> a.getKindCode().equals(InsuranceTypeCorrespondence.CONNECT_INSURANCE_TYPE[i]))
-                    .collect(Collectors.toList()).get(0);
-
-            kind.setCoveragePremium(coverageListDTOS.getPremium());
-            kind.setUnitAmount(kindInfoVo.getUnitAmount());
-            if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
-                kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
+        List<QuotedPriceResponse.BizPremiumDTO.CoverageListDTO> coverageList;
+
+        if (!ObjectUtils.isEmpty(quotedPriceResponse.getBizPremium())) {
+            coverageList = quotedPriceResponse.getBizPremium().getCoverageList();
+            List<KindInfoVo> kindList = yaQuoteInfoVo.getKindList();
+            for (KindInfoVo kindInfoVo : kindList) {
+                kind = new QuoteKindRespVo();
+                kind.setKindCode(kindInfoVo.getKindCode());
+                kind.setKindName(kindInfoVo.getKindName());
+                kind.setAmount(kindInfoVo.getAmount());
+                int i = ArrayUtil.indexOf(InsuranceTypeCorrespondence.JINZHANGGUI_TYPE, kindInfoVo.getKindCode());
+
+                QuotedPriceResponse.BizPremiumDTO.CoverageListDTO coverageListDTOS = coverageList.stream().filter(
+                                a -> a.getKindCode().equals(InsuranceTypeCorrespondence.CONNECT_INSURANCE_TYPE[i]))
+                        .collect(Collectors.toList()).get(0);
+
+                kind.setCoveragePremium(coverageListDTOS.getPremium());
+                kind.setUnitAmount(kindInfoVo.getUnitAmount());
+                if (!ObjectUtils.isEmpty(kindInfoVo.getDeductibleRate())) {
+                    kind.setDeductibleRate(Double.parseDouble(kindInfoVo.getDeductibleRate()));
+                }
+                kindList1.add(kind);
             }
-            kindList1.add(kind);
         }
 
         quoteRespVo.setRiskList(riskList1);

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

@@ -330,18 +330,18 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
         }
         insAreaCompany.setSumpremium(BigDecimal.valueOf(add));
         insAreaCompany.setOrderstatus(InsOrderStatus.S_0.getCode()); // "1"
-        insAreaCompany.setRiskinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getRiskList())));
-        insAreaCompany.setKindinfo(JSONObject.parseArray(JSONObject.toJSONString(quoteRespVo.getKindList())));
+        insAreaCompany.setRiskinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getRiskList())));
+        insAreaCompany.setKindinfo(JSON.parseArray(JSON.toJSONString(quoteRespVo.getKindList())));
         insAreaCompany.setJqapplyno(response.getJContractNo());
         insAreaCompany.setSyapplyno(response.getSContractNo());
         insAreaCompany.setCompanyId(esmInsCompanies.getId());
         insAreaCompany.setInscompany(esmInsCompanies.getNamesimple());
-        insAreaCompany.setAccidentInfo(JSONObject.parseObject(JSON.toJSONString(accident)));
+        insAreaCompany.setAccidentInfo(JSON.parseObject(JSON.toJSONString(accident)));
         insAreaCompany.setInsOrderNo(response.getContractMainNo());
         // 车船税
         TaxArrears taxArrears = new TaxArrears("往年欠税", response.getSumTaxDefault(), response.getSumOverdue());
         List<TaxArrears> taxArrearsList = Collections.singletonList(taxArrears);
-        insAreaCompany.setTaxArrears(JSONObject.parseArray(JSONObject.toJSONString(taxArrearsList)));
+        insAreaCompany.setTaxArrears(JSONObject.parseArray(JSON.toJSONString(taxArrearsList)));
         insAreaCompanyService.save(insAreaCompany);
         insOrdersService.updateByOrderStatus(orderNo, InsOrderStatus.S_0.getCode());
         quoteRespVo.setCompanyId(insAreaCompany.getId());