切换 test 提交

src/main/java/com/ydtech/components/queue/ZmQuoteConsumer.java

@@ -107,7 +107,7 @@ public class ZmQuoteConsumer {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getKindList();
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
 
         for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();

src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -974,7 +974,7 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
     public FeeSchemeReqDto getFeeSchemeInfo(BaseQuoteInfoVo quoteInfoVo, QuoteRespVo quoteRespVo, String agreementId, String productId) {
         PtlAgreementAttribution ptlAgreementAttribution = ptlAgreementAttributionService.getById(agreementId);
         CarInfoVo carInfoVo = quoteInfoVo.getCarInfo();
-        List<KingInfoVo> kindList = quoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = quoteInfoVo.getKindList();
         String thirdPartyInsurance = "";
         String driverAmount = "";
         String passengerAmount = "";

src/main/java/com/ydtech/modules/ins/model/guoren/PremiumReq.java

@@ -73,7 +73,7 @@ public class PremiumReq {
         CustomerInfoVo ownerInfo = yaQuoteInfoVo.getOwnerInfo();
 
         List<RiskInfoVo> riskList = yaQuoteInfoVo.getRiskList();
-        List<KingInfoVo> kindInfoVList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindInfoVList = yaQuoteInfoVo.getKindList();
 
         PremiumReq quoteReq = new PremiumReq();
         VehicleAndVesselTax vehicleAndVesselTax = yaQuoteInfoVo.getVehicleAndVesselTax();

src/main/java/com/ydtech/modules/ins/model/ya/YaQuoteInfoVo.java

@@ -46,7 +46,7 @@ public class YaQuoteInfoVo implements Serializable {
     private List<RiskInfoVo> riskList;
 
     @Valid
-    private List<KingInfoVo> kingList;
+    private List<KingInfoVo> kindList;
 
     private String quoteno;
 
@@ -62,7 +62,7 @@ public class YaQuoteInfoVo implements Serializable {
         this.insuredPersonInfo = insOrders.getInsureinfo().toCustomerInfoVo();
         this.carInfo = insOrders.getCarinfo().toCarInfoVo();
         this.riskList = insOrders.getRisk().stream().map(InsOrdersRisk::toRiskInfoVo).collect(Collectors.toList());
-        this.kingList = insOrders.getKing().stream().map(InsOrdersKing::toKingInfoVo).collect(Collectors.toList());;
+        this.kindList = insOrders.getKing().stream().map(InsOrdersKing::toKingInfoVo).collect(Collectors.toList());;
         this.quoteno = insOrders.getQuoteno();
     }
 

src/main/java/com/ydtech/modules/ins/model/yc/ruote/Ruote.java

@@ -223,7 +223,7 @@ public class Ruote {
          * 代码：cvrgListSY/CvrgSY
          */
 
-        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKingList(), vhl, carInfo.isNewEnergy());
+        CvrgListSY cvrgListSY = CvrgListSY.buildCvrgListSY(yaQuoteInfoVo.getKindList(), vhl, carInfo.isNewEnergy());
         condition.setCvrgListSY(cvrgListSY);
 
         /**

src/main/java/com/ydtech/modules/order/aop/aspect/QuoteVerificationAspect.java

@@ -59,7 +59,7 @@ public class QuoteVerificationAspect {
                 //税源查询
                 BaseQuoteInfoVo quoteInfo = insOrdersComponents.getQuoteInfo(orderno, agreementId);
                 String productid ;
-                List<KingInfoVo> kinds = quoteInfo.getKingList();
+                List<KingInfoVo> kinds = quoteInfo.getKindList();
                 List<RiskInfoVo> risks = quoteInfo.getRiskList();
 
                 boolean haveCarDamageKind = false;//是否含车损

src/main/java/com/ydtech/modules/order/entity/InsOrders.java

@@ -189,7 +189,7 @@ public class InsOrders implements Serializable {
         this.setInsuredname(quoteInfoVo.getPolicyHolderInfo().getName());
 
         List<RiskInfoVo> risks = quoteInfoVo.getRiskList();
-        List<KingInfoVo> kinds = quoteInfoVo.getKingList();
+        List<KingInfoVo> kinds = quoteInfoVo.getKindList();
 
         this.insuranceInformation(risks, kinds);
 

src/main/java/com/ydtech/modules/order/entity/api/huatai/request/HuaTaiQuotedPriceRequest.java

@@ -94,7 +94,7 @@ public class HuaTaiQuotedPriceRequest extends HuaTaiBaseRequest {
                                HuaTaiConfigureParameters huaTaiConfigureParameters) {
             CarInfoVo carInfo = baseQuoteInfoVo.getCarInfo();
             List<RiskInfoVo> riskList = baseQuoteInfoVo.getRiskList();
-            List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = baseQuoteInfoVo.getKindList();
             VehicleAndVesselTax vesselTax = baseQuoteInfoVo.getVehicleAndVesselTax();
             CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
             CustomerInfoVo policyHolderInfo = baseQuoteInfoVo.getPolicyHolderInfo();

src/main/java/com/ydtech/modules/order/entity/api/zhongmei/request/QuotedPriceRequest.java

@@ -97,7 +97,7 @@ public class QuotedPriceRequest extends BaseRequest {
                                AccidentalDrivingVo accidentalDrivingVo, ZmConfigureParameters zmConfigureParameters) {
             CarInfoVo carInfo = baseQuoteInfoVo.getCarInfo();
             List<RiskInfoVo> riskList = baseQuoteInfoVo.getRiskList();
-            List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = baseQuoteInfoVo.getKindList();
             CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
             CustomerInfoVo policyHolderInfo = baseQuoteInfoVo.getPolicyHolderInfo();
             CustomerInfoVo insuredPersonInfo = baseQuoteInfoVo.getInsuredPersonInfo();

src/main/java/com/ydtech/modules/order/entity/api/zijin/request/CalculatePremiumRequest.java

@@ -132,7 +132,7 @@ public class CalculatePremiumRequest implements Serializable {
         // 投被保人信息
         this.insuredList = InsuredListDTO.toInsuredListDTOList(quoteInfoVo.getPolicyHolderInfo(), quoteInfoVo.getInsuredPersonInfo());
         // 险别信息
-        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(actualValue, quoteInfoVo.getKingList(),
+        this.itemKindList = ItemKindListDTO.toItemKindListDTOList(actualValue, quoteInfoVo.getKindList(),
                 Integer.parseInt(quoteInfoVo.getCarInfo().getSeatCount()) - 1, quoteInfoVo.getCarInfo().isNewEnergy());
         // 浮动因子信息
         this.profitDataList = ProfitDataListDTO.toCoefficient(quoteVo.getCoefficient());

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

@@ -21,8 +21,11 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -200,7 +203,7 @@ public class InsOrdersBo {
 
 
         List<RiskInfoVo> risks = quoteInfoVo.getRiskList();
-        List<KingInfoVo> kinds = quoteInfoVo.getKingList();
+        List<KingInfoVo> kinds = quoteInfoVo.getKindList();
 
         // 2.3 主险种信息
         this.insuranceInformation(risks, kinds);
@@ -210,7 +213,7 @@ public class InsOrdersBo {
         this.setRisk(quoteInfoVo.getRiskList().stream()
                 .map(RiskInfoVo::toInsOrdersRisk)
                 .collect(Collectors.toList()));
-        this.setKing(quoteInfoVo.getKingList().stream()
+        this.setKing(quoteInfoVo.getKindList().stream()
                 .map(KingInfoVo::toInsOrdersKing)
                 .collect(Collectors.toList()));
 
@@ -297,8 +300,18 @@ public class InsOrdersBo {
 
     //设置车主信息
     public void setCarUserInfo(List<InsOrdersCarUserInfo> carUserInfoList) {
-        carUserInfoList.forEach(carUserInfo -> {
-            switch(carUserInfo.getUserType()){
+            carUserInfoList.forEach(carUserInfo -> {
+
+            Date date = null;
+            try {
+                date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(carUserInfo.getIdentifyValidDate());
+                carUserInfo.setIdentifyValidDate(new SimpleDateFormat("yyyy-MM-dd").format(date));
+                date = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(carUserInfo.getIdentifyValidEndDate());
+                carUserInfo.setIdentifyValidEndDate(new SimpleDateFormat("yyyy-MM-dd").format(date));
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            switch (carUserInfo.getUserType()) {
                 case 1:
                     this.setOwnerinfo(carUserInfo);
                     break;
@@ -310,12 +323,12 @@ public class InsOrdersBo {
                     break;
             }
         });
-        if(this.getOwnerinfo().getIdentifyNumber().equals(this.getApplyinfo().getIdentifyNumber())){
+        if (this.getOwnerinfo().getIdentifyNumber().equals(this.getApplyinfo().getIdentifyNumber())) {
             this.getApplyinfo().setOwner(true);
         }
-        if(this.getApplyinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())){
+        if (this.getApplyinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())) {
             this.getInsureinfo().setInsuranceHolder(true);
-        }else if(this.getOwnerinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())){
+        } else if (this.getOwnerinfo().getIdentifyNumber().equals(this.getInsureinfo().getIdentifyNumber())) {
             this.getInsureinfo().setOwner(true);
         }
     }

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

@@ -154,7 +154,7 @@ public class UnderwritingRulesBo implements Serializable {
         CustomerInfoVo ownerInfo = baseQuoteInfoVo.getOwnerInfo();
         this.setOwnerInfo(ownerInfo);
         // 车险
-        List<KingInfoVo> kindList = baseQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = baseQuoteInfoVo.getKindList();
         this.setInsurance(kindList);
     }
 

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

@@ -150,7 +150,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         // 车辆实际价值
         String currentValue = vehicleConfirmationResponse.getData().getVehicleModels().get(0).getCurrentValue();
         // 4. 报价接口
-        QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKingList(),
+        QuotationRequest quotationRequest = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKindList(),
                 currentValue, orderNo, carInfo, quoteVo.getAccidentalDrivingVo());
         QuotationResponse response = boHaiRequestApiComponent.quotation(quotationRequest, parameters.getSysSourceCode());
         //商业险重复投保  重复投保保单信息 :保单号:314042303060007485车牌号:晋A881SR车架号:LMGAC1381K1535834发动机号:F699317保险公司代码:YAIC签单日期:20230414起保日期:202305030000
@@ -225,7 +225,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
         if (ResponseCode.R_Z00001.getCode().equals(vehicleCheckCodeResponse.getResponseCode())) {
             String checkCode = vehicleCheckCodeResponse.getData().getCheckCode();
             //重新报价
-            QuotationRequest quotationRequestNew = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKingList(),
+            QuotationRequest quotationRequestNew = new QuotationRequest(parameters, quoteInfoVo.getRiskList(), quoteInfoVo.getKindList(),
                     currentValue, orderNo, carInfo, quoteVo.getAccidentalDrivingVo());
             List<QuotationRequest.CheckInfoDTO> checkInfoList = new ArrayList<QuotationRequest.CheckInfoDTO>();
             QuotationRequest.CheckInfoDTO checkInfo = new QuotationRequest.CheckInfoDTO("2", checkCode, "N");
@@ -596,7 +596,7 @@ public class BoHaiOrderApiServiceImpl implements BoHaiOrderApiService {
             List<QuotationResponse.DataDTO.BusinessPolicyDTO.CoveragesDTO> coverages = businessPolicy.getCoverages();
             // 商业险险种
             QuoteKindRespVo kind;
-            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
             for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());

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

@@ -232,7 +232,7 @@ public class DaJiaOrderServiceImpl implements DaJiaOrderService {
             }
 
             //5.保费计算接口
-            List<KingInfoVo> kindList = quoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = quoteInfoVo.getKindList();
             List<RiskInfoVo> riskList = quoteInfoVo.getRiskList();
             //非车险
             JSONObject accidentalDrivingVo = JSONObject.parseObject(JSONObject.toJSONString(t.getAccidentalDrivingVo()));

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

@@ -541,7 +541,7 @@ public class HuaTaiOrderApiServiceImpl implements HuaTaiOrderApiService {
         List<QuoteKindRespVo> kindList1 = new ArrayList<>();
         QuoteKindRespVo kind;
         if (!ObjectUtils.isEmpty(syCoverageDtoList)) {
-            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
             for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());

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

@@ -282,7 +282,7 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getInsuranceType();
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
         for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());

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

@@ -95,11 +95,13 @@ public class InsOrdersBusinessServiceImpl implements InsOrdersBusinessService {
             insOrdersBo.setOperatorid(userId);
         }
 
-        InsOrdersBo insOrders1 = insOrdersService.queryInsOrders(quoteInfoVo.getOrderNo());
+        InsOrders insOrders1 = insOrdersService.getById(quoteInfoVo.getOrderNo());
         //需要赋值代录单人ID
 
         if (ObjectUtils.isEmpty(insOrders1)) {
-            insOrders1 = insOrdersBo;
+            insOrders1 = new InsOrders();
+            insOrders1.setLicenseno(insOrdersBo.getLicenseno());
+            insOrders1.setUserid(insOrdersBo.getUserid());
         }
 
         if (!quoteInfoVo.getCarInfo().getLicenseNo().equals(insOrders1.getLicenseno())) {

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

@@ -218,8 +218,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 //        wrapper.select(InsOrdersBo::getCarinfo);
 //        wrapper.eq(InsOrdersCarInfo::getFrameno, vin).eq(InsOrdersBo::getOrderstatus,
 //                InsOrderStatusEnum.ACCEPT_INSURANCE.getCode()).orderByAsc(InsOrdersBo::getCreatetime).last("limit 1");
-        wrapper.inSql(InsOrdersCarInfo::getOrderNo, "select orderno from ins_orders where orderstatus = 3 orderByAsc createtime limit 1");
-        wrapper.eq(InsOrdersCarInfo::getFrameNo, vin);
+        wrapper.inSql(InsOrdersCarInfo::getOrderNo, "select orderno from ins_orders where orderstatus = 3 order By createtime asc");
+        wrapper.eq(InsOrdersCarInfo::getFrameNo, vin).last("limit 1");
 
         InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getOne(wrapper);
         if (!ObjectUtils.isEmpty(insOrdersCarInfo)) {
@@ -785,10 +785,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         final String orderNo = insOrders.getOrderno();
 
         //1. 车辆信息
+        insOrders.getCarinfo().setOrderNo(orderNo);
         insOrdersCarInfoService.save(insOrders.getCarinfo());
 
         // 2 人员信息
         List<InsOrdersCarUserInfo> carUserInfoList = new ArrayList<>();
+        insOrders.getOwnerinfo().setOrderNo(orderNo);
+        insOrders.getApplyinfo().setOrderNo(orderNo);
+        insOrders.getInsureinfo().setOrderNo(orderNo);
+        insOrders.getOwnerinfo().setUserType(1);
+        insOrders.getApplyinfo().setUserType(2);
+        insOrders.getInsureinfo().setUserType(3);
         carUserInfoList.add(insOrders.getOwnerinfo());
         carUserInfoList.add(insOrders.getApplyinfo());
         carUserInfoList.add(insOrders.getInsureinfo());
@@ -797,14 +804,21 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
         // 3 车船税信息
         InsOrdersTax insOrdersTax = insOrders.getVehicleAndVesselTax();
+        insOrdersTax.setOrderNo(orderNo);
         insOrdersTaxService.save(insOrdersTax);
 
         // 4 交强商业信息表
         List<InsOrdersKing> kingList = insOrders.getKing();
+        kingList.forEach(king->{
+            king.setOrderNo(orderNo);
+        });
         insOrdersKingService.saveBatch(kingList);
 
         // 5 商业险险种信息
         List<InsOrdersRisk> riskList = insOrders.getRisk();
+        riskList.forEach(risk->{
+            risk.setOrderNo(orderNo);
+        });
         insOrdersRiskService.saveBatch(riskList);
 
         SaSession saSession = StpUtil.getSessionByLoginId(StpUtil.getLoginId());
@@ -822,14 +836,47 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         final String orderNo = insOrders.getOrderno();
 
         //1. 车辆信息
+        insOrders.getCarinfo().setOrderNo(orderNo);
         insOrdersCarInfoService.updateByOrderNo(insOrders.getCarinfo());
 
         // 2 人员信息
         List<InsOrdersCarUserInfo> carUserInfoList = new ArrayList<>();
+        insOrders.getOwnerinfo().setOrderNo(orderNo);
+        insOrders.getApplyinfo().setOrderNo(orderNo);
+        insOrders.getInsureinfo().setOrderNo(orderNo);
+        insOrders.getOwnerinfo().setUserType(1);
+        insOrders.getApplyinfo().setUserType(2);
+        insOrders.getInsureinfo().setUserType(3);
         carUserInfoList.add(insOrders.getOwnerinfo());
         carUserInfoList.add(insOrders.getApplyinfo());
         carUserInfoList.add(insOrders.getInsureinfo());
-        insOrdersCarUserInfoService.updateBatchById(carUserInfoList);
+        insOrdersCarUserInfoService.remove(new LambdaQueryWrapper<InsOrdersCarUserInfo>().eq(InsOrdersCarUserInfo::getOrderNo, orderNo));
+        insOrdersCarUserInfoService.saveBatch(carUserInfoList);
+
+        //risk
+        insOrdersRiskService.remove(new LambdaQueryWrapper<InsOrdersRisk>().eq(InsOrdersRisk::getOrderNo, orderNo));
+        List<InsOrdersRisk>  riskList = new ArrayList<>();
+        insOrders.getRisk().forEach(risk->{
+            risk.setOrderNo(orderNo);
+            riskList.add(risk);
+        });
+        insOrdersRiskService.saveBatch(riskList);
+
+        //king
+        insOrdersKingService.remove(new LambdaQueryWrapper<InsOrdersKing>().eq(InsOrdersKing::getOrderNo, orderNo));
+        List<InsOrdersKing>  kingList = new ArrayList<>();
+        insOrders.getKing().forEach(king->{
+            king.setOrderNo(orderNo);
+            kingList.add(king);
+        });
+        insOrdersKingService.saveBatch(kingList);
+
+        //tax
+        insOrdersTaxService.remove(new LambdaQueryWrapper<InsOrdersTax>().eq(InsOrdersTax::getOrderNo, orderNo));
+        insOrders.getVehicleAndVesselTax().setOrderNo(orderNo);
+        insOrdersTaxService.save(insOrders.getVehicleAndVesselTax());
+
+
         return true;
     }
 

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

@@ -794,7 +794,7 @@ public class YongAnOrderServiceImpl implements YongAnOrderService {
     }
 
     private KindDTO[] geneKindInfo(YaQuoteInfoVo yaQuoteInfoVo, CarDTO carDTO, boolean jq_falg) {
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
         KindDTO[] kindList_n;
         if (jq_falg) {
             kindList_n = new KindDTO[kindList.size() + 1];

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

@@ -518,7 +518,7 @@ public class ZhongMeiOrderApiServiceImpl implements ZhongMeiOrderApiService {
         List<QuotedPriceResponse.BizPremiumDTO.CoverageListDTO> coverageList;
         if (!ObjectUtils.isEmpty(quotedPriceResponse.getBizPremium())) {
             coverageList = quotedPriceResponse.getBizPremium().getCoverageList();
-            List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+            List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
             for (KingInfoVo kindInfoVo : kindList) {
                 kind = new QuoteKindRespVo();
                 kind.setKindCode(kindInfoVo.getKindCode());

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

@@ -277,7 +277,7 @@ public class ZhongMeiOrderServiceImpl implements ZhongMeiOrderService {
 
         QuoteKindRespVo kind;
         Map<String, Double> map = response.getKindList();
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
 
         for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();

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

@@ -509,7 +509,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         List<CalculatePremiumResponse.ItemKindListDTO> itemKindList = calculatePremiumResponse.getItemKindList();
 
         // 商业险险种
-        List<KingInfoVo> kindList = yaQuoteInfoVo.getKingList();
+        List<KingInfoVo> kindList = yaQuoteInfoVo.getKindList();
         for (KingInfoVo kindInfoVo : kindList) {
             kind = new QuoteKindRespVo();
             kind.setKindCode(kindInfoVo.getKindCode());

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

@@ -165,14 +165,10 @@
     <select id="getOrderAndAreaCompany" parameterType="java.lang.String" resultMap="OrderResultMap">
         select o.orderno,
                o.quoteno,
-               o.car_info_id,
                o.userid,
                o.username,
                o.deptid,
                o.deptname,
-               o.owner_id,
-               o.apply_id,
-               o.insure_id,
                o.agreeid,
                o.productid,
                o.product,
@@ -186,7 +182,6 @@
                iac.sy_end_date   as syenddate,
                iac.id,
                iac.company_id,
-               iac.reptxt,
                iac.orderstatus,
                iac.inscompany,
                iac.jqapplyno,