阳光修改

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/po/YangGuangApiOrder.java

@@ -35,5 +35,5 @@ public class YangGuangApiOrder {
     /**
      * 非车信息
      */
-    private JSONArray crossInsurance;
+    private String crossInsurance;
 }

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangAccuracyCalculateRequest.java

@@ -706,12 +706,15 @@ public class YangGuangAccuracyCalculateRequest extends YangGuangBaseRequest{
         @JSONField(name = "InvoicePrice")
         private String InvoicePrice;
 
-        public ItemCarInfoDTO(CarInfoVo carInfoVo, YangGuangQueryVehicleModelResponse.carmodellist carmodellist) {
+        public
+        ItemCarInfoDTO(CarInfoVo carInfoVo, YangGuangQueryVehicleModelResponse.carmodellist carmodellist) {
             if (carInfoVo.getLicenseNo() != null) {
                 this.LicenseColor = "01";
             }
             this.LicenseType = carInfoVo.getLicenseKindCode();
-
+            if (!carInfoVo.getLicenseKindCode().equals("02")) {
+                this.LicenseType = "52";
+            }
             //车辆种类
             YangGuangCarType yangGuangCarType = Enum.valueOf(YangGuangCarType.class,carInfoVo.getCarTypeCode());
             this.VehicleType = yangGuangCarType.getCode();

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangGetNonVehicleProductsRequest.java

@@ -100,7 +100,7 @@ public class YangGuangGetNonVehicleProductsRequest extends YangGuangBaseRequest
         this.AgentCode = ygConfigureParameters.getAgentCode();
         this.ServiceArea = ygConfigureParameters.getServiceArea() == null ? "" : ygConfigureParameters.getServiceArea();
         this.Seatcount = carInfoVo.getSeatCount();
-        this.UseNatureCode = YgUseNatureCodeMapping.getYgUseNatureCode(carInfoVo.getVehicleUseCode());
+        this.UseNatureCode = carInfoVo.getVehicleUseCode();
 //        String cartype = jsonObject.getString("cartype");
         //车辆种类
         YangGuangCarType yangGuangCarType = Enum.valueOf(YangGuangCarType.class,carInfoVo.getCarTypeCode());

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/entity/request/YangGuangSubmitRequest.java

@@ -1,5 +1,6 @@
 package com.jzg.quotation.yangguang.api.entity.request;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.jzg.commons.entity.orders.po.InsOrders;
@@ -165,7 +166,7 @@ public class YangGuangSubmitRequest extends YangGuangBaseRequest{
         }
         InsOrdersCosts insOrdersCosts = underwritingVo.getInsOrdersCosts();
         if (insOrdersCosts.getJyPremium().compareTo(BigDecimal.ZERO) > 0) {
-            this.NonVehicleProductInformationList = JSONArray.parseArray(yangGuangApiOrder.getCrossInsurance().toJSONString(), YangGuangSubmitRequest.NonVehicleProductInformationList.class);
+            this.NonVehicleProductInformationList = JSON.parseArray(yangGuangApiOrder.getCrossInsurance(), NonVehicleProductInformationList.class);
             this.CasualtyFlag = "1";
         } else {
             this.CasualtyFlag = "0";

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiOrderServiceImpl.java

@@ -29,8 +29,7 @@ public class YangGuangApiOrderServiceImpl implements YangGuangApiOrderService {
         yangGuangApiOrder.setOrdersNo(quoteVo.getOrder().getOrdersNo());
         yangGuangApiOrder.setProductsCode(quoteVo.getProductId());
         List<YangGuangAccuracyCalculateResponse.PtptNonVehicleProductInformationList> list = yangGuangAccuracyCalculateResponse.getPtptNonVehicleProductInformationList();
-        JSONArray array = JSONArray.parseArray(JSON.toJSONString(list));
-        yangGuangApiOrder.setCrossInsurance(array);
+        yangGuangApiOrder.setCrossInsurance(list.toString());
         yangGuangApiOrder.setInfotransNo(yangGuangAccuracyCalculateResponse.getInfotransNo());
         yangGuangApiOrderRepository.save(yangGuangApiOrder);
     }

tenant/insurance/quotation-yangguang/src/main/java/com/jzg/quotation/yangguang/api/service/impl/YangGuangApiRequestImpl.java

@@ -100,7 +100,7 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                                           YangGuangConfigureParameters parameters,String url) throws JsonProcessingException {
 
         YangGuangAccuracyCalculateResponse response = yangGuangApiRequestComponent.accuracyCalculaye(request,url);
-        if (!response.getErrorCode().equals("0")) {
+        if (!response.getErrorCode().equals("0") || StringUtils.isNotEmpty(response.getRemarkCi())) {
             String endDate = extractEndDate(response);
             // 交强重复投保处理
             if (endDate != null) {
@@ -376,13 +376,15 @@ public class YangGuangApiRequestImpl implements YangGuangApiRequest {
                 // 获取缴费地址
                 PaymentLinkVo paymentLinkVo = new PaymentLinkVo();
                 paymentLinkVo.setOrder(orderStatusVo.getOrder());
+                paymentLinkVo.setInsOrdersCarUserInfoList(orderStatusVo.getInsOrdersCarUserInfoList());
+                paymentLinkVo.setInsOrdersCosts(orderStatusVo.getInsOrdersCosts());
                 PaymentLinkResultsVo paymentLinkResultsVo = getPaymentLink(paymentLinkVo);
                 orderStatusResultVo.setPaymentLink(paymentLinkResultsVo.getPaymentLink());
             }
             // 缴费成功 获取保单号
             String jqPolicyNo = yangGuangProposalStatusQueryResponse.getCiPolicyNo();
             String syPolicyNo = yangGuangProposalStatusQueryResponse.getBiPolicyNo();
-            if (jqPolicyNo != null || syPolicyNo != null) {
+            if (!jqPolicyNo.equals("") || !syPolicyNo.equals("")) {
                 orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.UNDERWRITED);
                 orderStatusResultVo.setJqPolicyno(jqPolicyNo);
                 orderStatusResultVo.setSyPolicyno(syPolicyNo);