切换test 提交

src/main/java/com/ydtech/modules/order/entity/bo/InsOrdersBo.java

@@ -310,6 +310,14 @@ public class InsOrdersBo {
                     break;
             }
         });
+        if(this.getOwnerinfo().getIdentifyNumber().equals(this.getApplyinfo().getIdentifyNumber())){
+            this.getApplyinfo().setOwner(true);
+        }
+        if(this.getApplyinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())){
+            this.getInsureinfo().setInsuranceHolder(true);
+        }else if(this.getOwnerinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())){
+            this.getInsureinfo().setOwner(true);
+        }
     }
 
 

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

@@ -934,7 +934,16 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         insOrdersBo.setCarUserInfo(ordersCarUserInfos);
         //获取车辆信息
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getCarInfoByOrderNo(orderNo);
-//        insOrdersBo.setCarAllInfo(insOrdersCarInfo);
+        insOrdersBo.setCarinfo(insOrdersCarInfo);
+
+        //获取险种信息
+        List<InsOrdersRisk> riskList = insOrdersRiskService.queryByOrderNo(orderNo);
+        insOrdersBo.setRisk(riskList);
+
+        List<InsOrdersKing> kingList = insOrdersKingService.queryByOrderNo(orderNo);
+        insOrdersBo.setKing(kingList);
+
+
         return insOrdersBo;
     }
 }

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

@@ -1,6 +1,7 @@
 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;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
@@ -50,6 +51,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -105,6 +107,9 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     @Autowired
     private RedisTemplate redisTemplate;
 
+    private String yongAnRpeRedisKey = "yongAn:Rep:RedisKey";
+
+
 //    @Override
 //    public List<CarModelDTO> vinSearch(String vin) {
 //        CarModel_Req carModelReq = new CarModel_Req();
@@ -364,7 +369,8 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         YaConfigureParameters yaConfigureParameters = configureParametersComponents.toEntity(YaConfigureParameters.class,
                 insAreaCompany.getAgreementId());
 
-        InsOrders orders = insOrdersService.getById(insAreaCompany.getOrderno());
+//        InsOrders orders = insOrdersService.getById(insAreaCompany.getOrderno());
+        InsOrdersBo orders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
         RequestData requestData = new RequestData();
         RequestHead requestHead = getRequestHead("C3", yaConfigureParameters);
         RequestBodyC3 requestBodyC3 = new RequestBodyC3();
@@ -373,8 +379,8 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
         mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
         try {
             //1.组装RequestBody
-
-            ResponseDataC2 responseDataC2 = JSON.parseObject(insAreaCompany.getReptxt().toJSONString(), ResponseDataC2.class);
+//            JSONObject responseDataC2 = JSONObject.parseObject();
+            ResponseDataC2 responseDataC2 = JSON.parseObject(String.valueOf(redisTemplate.opsForValue().get(yongAnRpeRedisKey + insAreaCompany.getId())), ResponseDataC2.class);
             InsOrdersCarUserInfo insureinfo = orders.getInsureinfo();
 
             requestBodyC3.setQuotationNoCI(responseDataC2.getResponseBody().getQuotationNoCI());
@@ -546,7 +552,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             YaConfigureParameters yaConfigureParameters = configureParametersComponents.toEntity(YaConfigureParameters.class,
                     insAreaCompany.getAgreementId());
 
-            InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+            InsOrdersBo insOrders = insOrdersService.queryInsOrders(insAreaCompany.getOrderno());
             RequestData requestData = new RequestData();
             RequestHead requestHead = getRequestHead("B7", yaConfigureParameters);
             RequestBodyB7 requestBodyB7 = new RequestBodyB7();
@@ -554,7 +560,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             ObjectMapper mapper = new XmlMapper();
             mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
             //1.组装RequestBody
-            ResponseDataC2 responseDataC2 = JSON.parseObject(insAreaCompany.getReptxt().toJSONString(), ResponseDataC2.class);
+            ResponseDataC2 responseDataC2 = JSON.parseObject(String.valueOf(redisTemplate.opsForValue().get(yongAnRpeRedisKey + insAreaCompany.getId())), ResponseDataC2.class);
             List<ExtendInfoDto> extendInfoList = responseDataC2.getResponseBody().getExtendInfo();
             Map<String, String> maps = extendInfoList.stream().collect(LinkedHashMap::new, (m, v) -> m.put(v.getKey(), v.getValue()),
                     LinkedHashMap::putAll);
@@ -788,7 +794,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     }
 
     private KindDTO[] geneKindInfo(YaQuoteInfoVo yaQuoteInfoVo, CarDTO carDTO, boolean jq_falg) {
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
         KindDTO[] kindList_n;
         if (jq_falg) {
             kindList_n = new KindDTO[kindList.size() + 1];
@@ -1182,10 +1188,9 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
             InsAreaCompany insAreaCompany = new InsAreaCompany(quoteRespVo, ptlAgreementAttribution);
             InsOrders insOrder = insOrdersService.getById(quoteInfoVo.getOrderNo());
             //报价成功更新险种信息
-            redisTemplate.opsForValue().set("yongan:quote:" + insOrder.getOrderno(), JSON.toJSONString(quoteRespVo), 30, TimeUnit.MINUTES);
-
-            insAreaCompany.setReqtxt(JSON.parseObject(JSON.toJSONString(requestData)));
-            insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseDataC2)));
+            redisTemplate.opsForValue().set(yongAnRpeRedisKey + insAreaCompany.getId(), JSON.parseObject(JSON.toJSONString(responseDataC2)), 30, TimeUnit.MINUTES);
+//            insAreaCompany.setReqtxt(JSON.parseObject(JSON.toJSONString(requestData)));
+//            insAreaCompany.setReptxt(JSON.parseObject(JSON.toJSONString(responseDataC2)));
             insAreaCompany.setTaxArrears(JSON.parseArray(JSON.toJSONString(quoteRespVo.getTaxArrears())));
 
             insAreaCompanyService.insertCompanyAndOrders(insAreaCompany);

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -10,19 +10,19 @@
         <result property="orderstatus" column="orderstatus" jdbcType="VARCHAR"/>
         <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
         <result property="insCompany" column="ins_company" jdbcType="VARCHAR"/>
-        <result property="carinfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="carinfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="userid" column="userid" jdbcType="VARCHAR"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="deptid" column="deptid" jdbcType="VARCHAR"/>
         <result property="deptname" column="deptname" jdbcType="VARCHAR"/>
-        <result property="ownerinfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="applyinfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="insureinfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"
-                jdbcType="VARCHAR"/>
+<!--        <result property="ownerinfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="applyinfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="insureinfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"-->
+<!--                jdbcType="VARCHAR"/>-->
         <result property="agreeid" column="agreeid" jdbcType="VARCHAR"/>
         <result property="productid" column="productid" jdbcType="VARCHAR"/>
         <result property="product" column="product" jdbcType="VARCHAR"/>
@@ -34,32 +34,32 @@
         <result property="jqenddate" column="jqenddate" jdbcType="VARCHAR"/>
         <result property="systartdate" column="systartdate" jdbcType="VARCHAR"/>
         <result property="syenddate" column="syenddate" jdbcType="VARCHAR"/>
-        <result property="risk" column="risk" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="king" column="king" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="vehicleAndVesselTax" column="vehicle_and_vessel_tax"
-                javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="risk" column="risk" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="king" column="king" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="vehicleAndVesselTax" column="vehicle_and_vessel_tax"-->
+<!--                javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="subOrderId" column="subOrderId" jdbcType="VARCHAR"/>
     </resultMap>
     <resultMap id="OrderResultMap" type="com.ydtech.modules.order.entity.vo.OrderVo">
         <id property="orderno" column="orderno" jdbcType="VARCHAR"/>
         <result property="quoteno" column="quoteno" jdbcType="VARCHAR"/>
         <result property="orderstatus" column="orderstatus" jdbcType="VARCHAR"/>
-        <result property="carinfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="carinfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="userid" column="userid" jdbcType="VARCHAR"/>
         <result property="username" column="username" jdbcType="VARCHAR"/>
         <result property="deptid" column="deptid" jdbcType="VARCHAR"/>
         <result property="deptname" column="deptname" jdbcType="VARCHAR"/>
-        <result property="ownerinfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="applyinfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="insureinfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"
-                jdbcType="VARCHAR"/>
+<!--        <result property="ownerinfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="applyinfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="insureinfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"-->
+<!--                jdbcType="VARCHAR"/>-->
         <result property="agreeid" column="agreeid" jdbcType="VARCHAR"/>
         <result property="productid" column="productid" jdbcType="VARCHAR"/>
         <result property="product" column="product" jdbcType="VARCHAR"/>
@@ -82,10 +82,10 @@
         <result property="jqpolicyno" column="jqpolicyno" jdbcType="VARCHAR"/>
         <result property="syapplyno" column="syapplyno" jdbcType="VARCHAR"/>
         <result property="sypolicyno" column="sypolicyno" jdbcType="VARCHAR"/>
-        <result property="riskinfo" column="riskinfo" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="kindinfo" column="kindinfo" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="riskinfo" column="riskinfo" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="kindinfo" column="kindinfo" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="jqpremium" column="jqpremium" jdbcType="DECIMAL"/>
         <result property="sypremium" column="sypremium" jdbcType="DECIMAL"/>
         <result property="jypremium" column="jypremium" jdbcType="DECIMAL"/>
@@ -105,8 +105,8 @@
         <result property="paymentLink" column="payment_link" jdbcType="VARCHAR"/>
         <result property="accidentInfo" column="accident_info" javaType="com.alibaba.fastjson.JSONArray"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="taxArrears" column="tax_arrears" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="taxArrears" column="tax_arrears" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="crossInsurance" column="cross_insurance" javaType="com.alibaba.fastjson.JSONArray"
                 typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
     </resultMap>
@@ -116,9 +116,9 @@
         <id property="orderNo" column="orderno" jdbcType="VARCHAR"/>
         <result property="licenseNo" column="licenseno" jdbcType="VARCHAR"/>
         <result property="fraMeno" column="frameno" jdbcType="VARCHAR"/>
-        <result property="carInfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"  typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="carInfo" column="carinfo" javaType="com.alibaba.fastjson.JSONObject"  typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="score" column="score" jdbcType="VARCHAR"/>
-        <result property="ownerInfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"  typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="ownerInfo" column="ownerinfo" javaType="com.alibaba.fastjson.JSONObject"  typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="jqpRemIum" column="jqpremium" jdbcType="VARCHAR"/>
         <result property="apiType" column="api_type" jdbcType="VARCHAR"/>
         <result property="jqPolicyno" column="jqpolicyno" jdbcType="VARCHAR"/>
@@ -139,12 +139,12 @@
         <result property="agreementId" column="agreement_id" jdbcType="VARCHAR"/>
         <result property="userId" column="userid" jdbcType="VARCHAR"/>
         <result property="userName" column="username" jdbcType="VARCHAR"/>
-        <result property="applyInfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="insureInfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
-        <result property="kindInfo" column="kindinfo" javaType="com.alibaba.fastjson.JSONArray"
-                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>
+<!--        <result property="applyInfo" column="applyinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="insureInfo" column="insureinfo" javaType="com.alibaba.fastjson.JSONObject"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
+<!--        <result property="kindInfo" column="kindinfo" javaType="com.alibaba.fastjson.JSONArray"-->
+<!--                typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler" jdbcType="VARCHAR"/>-->
         <result property="payDate" column="pay_date" jdbcType="VARCHAR"/>
         <result property="signingTime" column="signing_time" jdbcType="VARCHAR"/>
         <result property="crossInsurance" column="cross_insurance" javaType="com.alibaba.fastjson.JSONArray"