补录订单

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersExternalFee.java

@@ -10,7 +10,7 @@ import lombok.Data;
 public class InsOrdersExternalFee extends BaseModel {
 
     @Schema(description = "订单号")
-    private String OrderNo;
+    private String orderNo;
 
     @Schema(description = "交强手续费比例")
     private String jqSuperviseCostsProportion;

commons/src/main/java/com/jzg/commons/entity/quote/vo/CarInfoVo.java

@@ -3,7 +3,6 @@ package com.jzg.commons.entity.quote.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.jzg.commons.constants.quote.enums.quote.*;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -215,16 +214,15 @@ public class CarInfoVo implements Serializable {
     /**
      * 过户车(如果存在交强险商业险分开的情况是转为交强险过户)
      */
+    @Schema(description = "是否二手车")
     private boolean transfer;
 
     /**
      * 商业险过户
      */
     @Schema(description = "商业险过户")
-    private boolean biTransfer;
+    private boolean transferBi;
 
-    @Schema(description = "是否二手车")
-    private boolean secondHandCar;
 
     /**
      * 是否贷款车 true 贷款车
@@ -336,6 +334,6 @@ public class CarInfoVo implements Serializable {
         this.registerDate = carInfo.getRegisterDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         this.issueDate = carInfo.getIssueDate().format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
         this.transfer = carInfo.getTransfer() == 1;
-        this.biTransfer = carInfo.getTransferBi() == 1;
+        this.transferBi = carInfo.getTransferBi() == 1;
     }
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersAdd.java

@@ -5,6 +5,7 @@ import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+import com.jzg.commons.entity.vo.InsFeeOrdersVo;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -24,11 +25,15 @@ public class InsOrdersAdd extends QuoteVo {
     private InsOrdersOtherInfoVo insOrdersOtherInfo;
 
     @Schema(description = "费用信息")
-    private InsOrdersExternalFee ordersExternal;
+    private InsOrdersExternalFee externalFee;
 
     @Schema(description = "订单影像资料")
     private InsTaskImagesAdd imagesAdds;
 
+    @Schema(description = "订单费用")
+    private InsFeeOrdersVo feeOrdersVo;
+
+
     @Schema(description = "保单信息")
     private InsOrdersExternalPolicy insOrdersExternalPolicy;
 

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersEnd.java

@@ -4,6 +4,7 @@ import com.jzg.commons.entity.dto.InsTaskImagesAdd;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalFee;
 import com.jzg.commons.entity.orders.po.InsOrdersExternalPolicy;
+import com.jzg.commons.entity.vo.InsFeeOrdersVo;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -28,6 +29,9 @@ public class InsOrdersEnd extends QuoteVo {
     @Schema(description = "订单影像资料")
     private InsTaskImagesAdd imagesAdds;
 
+    @Schema(description = "订单费用")
+    private InsFeeOrdersVo feeOrdersVo;
+
     @Schema(description = "保单信息")
     private InsOrdersExternalPolicy insOrdersExternalPolicy;
 

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -3,10 +3,10 @@ package com.jzg.commons.entity.quote.vo.orders;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.entity.orders.po.*;
-import com.jzg.commons.entity.po.InsFeeOrders;
+import com.jzg.commons.entity.quote.vo.QuoteVo;
+import com.jzg.commons.entity.vo.InsFeeOrdersVo;
 import com.jzg.commons.entity.vo.InsOrdersOtherInfoVo;
 import com.jzg.commons.entity.vo.InsTaskImagesVo;
-import com.jzg.commons.entity.quote.vo.QuoteVo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -115,6 +115,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "订单批改信息")
     private InsOrderAdjust insOrderAdjust;
 
+    @Schema(description = "订单费用")
+    private InsFeeOrdersVo feeOrdersVo;
+
     @Data
     public static class Salesman{
         @Schema(description = "业务员姓名")

commons/src/main/java/com/jzg/commons/entity/vo/InsFeeOrdersVo.java

@@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.entity.po.InsFeeOrders;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -15,6 +17,8 @@ import java.time.LocalDateTime;
  */
 
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class InsFeeOrdersVo {
     @Schema(description = "订单号")
     @TableId
@@ -95,6 +99,23 @@ public class InsFeeOrdersVo {
     @Schema(description = "驾意险加投费费费用")
     private String jyAdditionalPremium;
 
+    @Schema(description = "交强出口比例")
+    private BigDecimal jqExportRatio;
+
+    @Schema(description = "商业出口比例")
+    private BigDecimal syExportRatio;
+
+    @Schema(description = "驾意出口比例")
+    private BigDecimal jyExportRatio;
+
+    @Schema(description = "交强入口比例")
+    private BigDecimal jqInletRatio;
+
+    @Schema(description = "商业入口比例")
+    private BigDecimal syInletRatio;
+
+    @Schema(description = "驾意入口比例")
+    private BigDecimal jyInletRatio;
 
     @Schema(description = "交强险出口留点费用")
     private String jqExportKeepPointPremium;

commons/src/main/java/com/jzg/commons/entity/vo/InsOrdersOtherInfoVo.java

@@ -31,7 +31,7 @@ public class InsOrdersOtherInfoVo {
     private String taxPremium;
 
     @Schema(description = "交强险单号")
-    private String jqApplyNo;
+    private String jqPolicyNo;
 
     @Schema(description = "交强续保")
     private String jqRenewal;

tenant/insurance/quotation-guoshou/src/main/java/com/jzg/quotation/guoshou/crawler/entity/request/SubmitInsuranceInformationRequest.java

@@ -18,8 +18,6 @@ import com.jzg.quotation.guoshou.crawler.util.RsaUtils;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -328,7 +326,7 @@ public class SubmitInsuranceInformationRequest {
         carVoFront.setVehiclestyle(carTypeCode);
         carVoFront.setVehiclestyleName(GsConstants.CAR_TYPE.get(carTypeCode));
         carVoFront.setNewCarFlag("0");
-        carVoFront.setSecondhandcarflag(carInfoVo.isSecondHandCar() ? "1" : "0");
+        carVoFront.setSecondhandcarflag(carInfoVo.isTransfer() ? "1" : "0");
         carVoFront.setFullWeightMax(vehicleModelDetail.getFullWeightMax());
         carVoFront.setFullWeightMin(vehicleModelDetail.getFullWeightMin());
         carVoFront.setImportFlag("1");

tenant/insurance/quotation-huanong/src/main/java/com/jzg/quotation/huanong/crawler/entity/request/HuaNongCrawlerQuotedPriceRequestRequest.java

@@ -778,7 +778,7 @@ public class HuaNongCrawlerQuotedPriceRequestRequest implements HuaNongHeadReque
                     }
                     this.transferMark = carInfoVo.isTransfer();
 
-                    this.transferMarkBi = carInfoVo.isBiTransfer();
+                    this.transferMarkBi = carInfoVo.isTransferBi();
                     this.useYears = "";
                     this.useYearsDetail = "";
                     this.vIN = carInfoVo.getVinNo();

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrdersMapper.java

@@ -146,4 +146,6 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
     List<BusinessDistributionVo> getProvinceBusinessDistribution(@Param("province") String province,
                                                                  @Param("userId") String userId,
                                                                  @Param("systemCode") String systemCode);
+
+    String selectMainOrderNumber(@Param("licenseNo") String licenseNo,@Param("realQuoteUserId") String realQuoteUserId);
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersCarInfoServiceImpl.java

@@ -76,7 +76,7 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
         } else {
             info.setTransferDate(null);
         }
-        info.setTransferBi(Integer.parseInt(carInfoVo.isBiTransfer() ? "1" : "0"));
+        info.setTransferBi(Integer.parseInt(carInfoVo.isTransferBi() ? "1" : "0"));
         this.save(info);
         return info;
     }
@@ -128,7 +128,7 @@ public class InsOrdersCarInfoServiceImpl extends ServiceImpl<InsOrdersCarInfoMap
         } else {
             insOrdersCarInfo.setTransferDate(null);
         }
-        insOrdersCarInfo.setTransferBi(Integer.parseInt(carInfoVo.isBiTransfer() ? "1" : "0"));
+        insOrdersCarInfo.setTransferBi(Integer.parseInt(carInfoVo.isTransferBi() ? "1" : "0"));
         this.updateById(insOrdersCarInfo);
 
         // 字段比对

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -46,6 +46,7 @@ import com.jzg.commons.util.idgen.IdGenerate;
 import com.jzg.quotation.commons.client.OrgClient;
 import com.jzg.quotation.commons.client.PartnerDistributionClient;
 import com.jzg.quotation.commons.client.PlatformClient;
+import com.jzg.quotation.commons.utils.BeanCopyUtil;
 import com.jzg.quotation.commons.utils.SnowFlakeUtil;
 import com.jzg.quotation.summary.consumer.template.OrderMessageTemplate;
 import com.jzg.quotation.summary.entity.bo.DataValueBo;
@@ -154,18 +155,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public HttpResult saveOrders(InsOrdersAdd ordersAdd) {
         // 检查输入参数是否为空，如果为空则返回错误信息
         try {
+
             // 获取订单对象并设置引用编号
             InsOrders insOrders = ordersAdd.getInsOrders();
-            insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());
-            insOrders.setCompanyId(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
-            HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrdersOtherInfo().getCompanyId());
+            insOrders.setRealQuoteUserId(baseController.getUserName());
+            InsOrdersAdd insOrdersAdd = BeanCopyUtil.deepCopy(ordersAdd, InsOrdersAdd.class);
+            String parentId = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(),ordersAdd.getInsOrders().getRealQuoteUserId());
+            if (StringUtils.isEmpty(insOrders.getQuoteNo())){
+                insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());
+            }
+            HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(ordersAdd.getInsOrders().getCompanyId());
             String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
             insOrders.setCompanyName(companyName);
-            insOrders.setSigningTime(ordersAdd.getInsOrdersOtherInfo().getSigningTime());
             insOrders.setIsTemporarily(ordersAdd.getIsTemporarily());
             insOrders.setProductName(ProductsType.getProductNameByCode(ordersAdd.getProductId()));
-            insOrders.setOrderStatus(InsOrderStatusEnum.UNDERWRITED.getCode());
-            insOrders.setRealQuoteUserId(baseController.getUserName());
+            insOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_ING.getCode());
+
+            insOrders.setEntryStatus(3);
+            insOrders.setParentId(parentId);
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.insert(insOrders);
             if (insertResult <= 0) {
@@ -207,6 +214,14 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersCosts.setOrderNo(quoteNo);
             insOrdersCostsService.save(insOrdersCosts);
 
+            //  保存保单号
+            InsOrdersPolicy policy = BeanUtil.copyProperties(insOrdersOtherInfo,InsOrdersPolicy.class);
+            policy.setOrderNo(quoteNo);
+            insOrdersPolicyService.save(policy);
+
+            //  保存订单费用
+            updateOrSaveFeeOrder(ordersAdd.getFeeOrdersVo(),quoteNo);
+
             // 保险种类信息
             List<KindInfoVo> kindInfoVo = ordersAdd.getKindInfoVo();
             List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
@@ -236,9 +251,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             if (ObjectUtil.isNotEmpty(imagesAdds)) {
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
                 insTaskImages.forEach(image -> {
-                    image.setQuoteNo(quoteNo);
-                    insTaskImagesService.save(image);
+                    image.setQuoteNo(insOrders.getQuoteNo());
                 });
+                insTaskImagesService.saveBatch(insTaskImages);
             }
 
             InsOrdersExternalPolicy ordersExternalPolicy = ordersAdd.getInsOrdersExternalPolicy();
@@ -249,7 +264,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             this.orderStatusMessage(insOrders,
                     insOrdersCarInfo, insOrdersCosts,
                     baseController.getToken(), MessageCodeEnum.TEMPLATE_9);
-
+            if (StringUtils.equals("0",parentId)){
+                InsOrders orders = insOrdersAdd.getInsOrders();
+                orders.setQuoteNo(insOrders.getQuoteNo());
+                insOrdersAdd.setInsOrders(orders);
+                saveOrders(insOrdersAdd);
+            }
             // 返回成功信息，表示订单、车辆和用户信息保存成功
             return HttpResult.ok("保存成功");
 
@@ -260,16 +280,28 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         }
     }
 
+
+    //  更新订单费用信息
+    public void updateOrSaveFeeOrder(InsFeeOrdersVo feeOrdersVo,String quoteNo){
+        if (StringUtils.isEmpty(feeOrdersVo.getAgreementId())){
+            feeOrdersVo.setAgreementId(null);
+        }
+        InsFeeOrders feeOrders = BeanUtil.copyProperties(feeOrdersVo,InsFeeOrders.class);
+        feeOrders.setOrderNo(quoteNo);
+        insFeeOrdersMapper.insertOrUpdate(feeOrders);
+    }
+
+
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public HttpResult updateOrders(InsOrdersEnd ordersEnd) {
         try {
             // 获取订单对象并设置引用编号
             InsOrders insOrders = ordersEnd.getInsOrders();
-            InsOrdersOtherInfoVo ordersOtherInfo = ordersEnd.getInsOrdersOtherInfo();
-            if (ObjectUtil.isNotEmpty(ordersOtherInfo)) {
-                insOrders.setCompanyId(ordersOtherInfo.getCompanyId());
-                insOrders.setCompanyName(ordersOtherInfo.getCompanyName());
-                insOrders.setSigningTime(ordersOtherInfo.getSigningTime());
+            InsOrders orders = insOrdersMapper.selectById(insOrders.getId());
+            if (Objects.isNull(orders)){
+                throw new SystemException("订单不存在或已删除");
             }
             // 插入订单信息，如果插入失败，则返回错误信息
             int insertResult = insOrdersMapper.updateById(insOrders);
@@ -282,39 +314,31 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             InsOrdersCarInfo insOrdersCarInfo = BeanUtil.copyProperties(ordersEnd.getCarInfoVo(), InsOrdersCarInfo.class);
             ordersCarInfoService.update(insOrdersCarInfo, new LambdaUpdateWrapper<>(InsOrdersCarInfo.class).eq(InsOrdersCarInfo::getOrderNo, quoteNo));
 
-            // 获取用户信息对象，并设置订单编号，然后保存用户信息
-            List<InsOrdersCarUserInfo> userInfos = new ArrayList<>();
-            InsOrdersCarUserInfo ownersInfo = BeanUtil.copyProperties(ordersEnd.getOwnersInfo(), InsOrdersCarUserInfo.class);
-
-            userInfos.add(ownersInfo);
-            InsOrdersCarUserInfo policyHolderInfo = BeanUtil.copyProperties(ordersEnd.getPolicyHolderInfo(), InsOrdersCarUserInfo.class);
-
-            userInfos.add(policyHolderInfo);
-            InsOrdersCarUserInfo insuredPersonInfo = BeanUtil.copyProperties(ordersEnd.getInsuredPersonInfo(), InsOrdersCarUserInfo.class);
-
-            userInfos.add(insuredPersonInfo);
-            //
-            ordersCarUserInfoService.updateBatchById(userInfos);
+            //更新订单人员信息
+            updatePersonnelInformation(ordersEnd);
 
             //更新订单其他信息
             InsOrdersOtherInfoVo insOrdersOtherInfo = ordersEnd.getInsOrdersOtherInfo();
-
+            //更新订单其他属性
             InsOrdersOther insOrdersOther = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersOther.class);
             insOrdersOther.setOrderNo(quoteNo);
             insOrdersOtherService.updateById(insOrdersOther);
-            // 保存其他信息
+            // 保存费用信息
             InsOrdersCosts insOrdersCosts = BeanUtil.copyProperties(insOrdersOtherInfo, InsOrdersCosts.class);
-            if (ObjectUtil.isNotNull(insOrdersCosts.getJqPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSyPremium())
-                    || ObjectUtil.isNotNull(insOrdersCosts.getJyPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getSumPremium())
-                    || ObjectUtil.isNotNull(insOrdersCosts.getTaxPremium()) || ObjectUtil.isNotNull(insOrdersCosts.getJqRatio())
-                    || ObjectUtil.isNotNull(insOrdersCosts.getSyRatio())) {
-                insOrdersCosts.setOrderNo(quoteNo);
-                insOrdersCostsService.updateById(insOrdersCosts);
-            }
+            insOrdersCosts.setOrderNo(quoteNo);
+            insOrdersCostsService.updateById(insOrdersCosts);
             // 保险种类信息
             List<KindInfoVo> kindInfoVo = ordersEnd.getKindInfoVo();
             List<InsOrdersKind> insOrdersKinds = BeanUtil.copyToList(kindInfoVo, InsOrdersKind.class);
             insOrdersKindService.updateBatchById(insOrdersKinds);
+            //  更新保单号
+            InsOrdersPolicy policy = BeanUtil.copyProperties(insOrdersOtherInfo,InsOrdersPolicy.class);
+            policy.setOrderNo(quoteNo);
+            insOrdersPolicyService.updateById(policy);
+
+
+            //更新订单费用
+            updateOrSaveFeeOrder(ordersEnd.getFeeOrdersVo(),quoteNo);
 
             // 税费信息
             VehicleAndVesselTaxVo vehicleAndVesselTax = ordersEnd.getVehicleAndVesselTaxVo();
@@ -344,11 +368,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
             InsTaskImagesAdd imagesAdds = ordersEnd.getImagesAdds();
             if (ObjectUtil.isNotEmpty(imagesAdds)) {
+                insTaskImagesService.remove(new LambdaQueryWrapper<>(InsTaskImages.class).eq(InsTaskImages::getQuoteNo,quoteNo));
                 List<InsTaskImages> insTaskImages = BeanUtil.copyToList(imagesAdds.getImages(), InsTaskImages.class);
                 insTaskImages.forEach(image -> {
                     image.setQuoteNo(String.valueOf(quoteNo));
-                    insTaskImagesService.save(image);
                 });
+                insTaskImagesService.saveBatch(insTaskImages);
             }
 
             InsOrdersExternalPolicy ordersExternalPolicy = ordersEnd.getInsOrdersExternalPolicy();
@@ -369,6 +394,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     }
 
 
+
+    public void updatePersonnelInformation(InsOrdersEnd ordersEnd){
+        // 获取用户信息对象，并设置订单编号，保存用户信息
+        List<InsOrdersCarUserInfo> userInfos = new ArrayList<>();
+        InsOrdersCarUserInfo ownersInfo = BeanUtil.copyProperties(ordersEnd.getOwnersInfo(), InsOrdersCarUserInfo.class);
+        userInfos.add(ownersInfo);
+        InsOrdersCarUserInfo policyHolderInfo = BeanUtil.copyProperties(ordersEnd.getPolicyHolderInfo(), InsOrdersCarUserInfo.class);
+        userInfos.add(policyHolderInfo);
+        InsOrdersCarUserInfo insuredPersonInfo = BeanUtil.copyProperties(ordersEnd.getInsuredPersonInfo(), InsOrdersCarUserInfo.class);
+        userInfos.add(insuredPersonInfo);
+        ordersCarUserInfoService.updateBatchById(userInfos);
+    }
+
+
     @Override
     public IPage<OrdersListVo> pageList(InsOrdersParam insOrdersParam) {
         if (Objects.nonNull(insOrdersParam.getRecordingTime()) && insOrdersParam.getRecordingTime().length > 0) {
@@ -449,20 +488,20 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         if (CollectionUtil.isNotEmpty(insOrdersVo.getInsOrdersRiskList())) {
             insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
                 insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
-//                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
-//                    insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
-//                    List<KindInfoVo> kindInfoVos = insOrdersVo.getKindInfoVo();
-//                    InsOrdersCosts insOrdersCosts = insOrdersVo.getInsOrdersCosts();
-//                    KindInfoVo jqKind = new KindInfoVo();
-//                    jqKind.setKindCode("J1");
-//                    jqKind.setKindName("交强险");
-//                    if(Objects.nonNull(insOrdersCosts.getJqPremium())){
-//                        jqKind.setPremium(insOrdersCosts.getJqPremium().toString());
-//                    }
-//                    kindInfoVos.add(jqKind);
-//                }else {
-//                    insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
-//                }
+                insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
+                if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
+                    List<KindInfoVo> kindInfoVos = insOrdersVo.getKindInfoVo();
+                    InsOrdersCosts insOrdersCosts = insOrdersVo.getInsOrdersCosts();
+                    KindInfoVo jqKind = new KindInfoVo();
+                    jqKind.setKindCode("J1");
+                    jqKind.setKindName("交强险");
+                    if(Objects.nonNull(insOrdersCosts.getJqPremium())){
+                        jqKind.setPremium(insOrdersCosts.getJqPremium().toString());
+                    }
+                    kindInfoVos.add(jqKind);
+                }else {
+                    insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
+                }
             });
         }
         // 订单电子保单信息
@@ -512,6 +551,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         return insOrdersVo;
     }
 
+
     private RiskInfoVo getRiskInfoVo(InsOrdersRisk riskInfo) {
         RiskInfoVo riskInfoVo = new RiskInfoVo();
         riskInfoVo.setId(riskInfo.getId());

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -51,6 +51,7 @@
         <result property="issueDate" column="issue_date" jdbcType="VARCHAR"/>
         <result property="transferDate" column="transfer_date" jdbcType="VARCHAR"/>
         <result property="transfer" column="transfer" jdbcType="VARCHAR"/>
+        <result property="transferBi" column="transfer_bi" jdbcType="VARCHAR"/>
     </resultMap>
     <!--    订单 车辆人员信息 -->
     <resultMap id="carUserInfoMap" type="com.jzg.commons.entity.orders.po.InsOrdersCarUserInfo">
@@ -129,9 +130,15 @@
         <result property="isDjq" column="is_djq" jdbcType="VARCHAR"/>
         <result property="jqAdjustRate" column="jq_adjust_rate" jdbcType="VARCHAR"/>
         <result property="syAdjustRate" column="sy_adjust_rate" jdbcType="VARCHAR"/>
-        <result property="tpColorScore" column="tp_color_score" jdbcType="VARCHAR"/>
         <result property="signingTime" column="signing_time" jdbcType="VARCHAR"/>
         <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+        <result property="jqPremium" column="jq_premium" jdbcType="VARCHAR"/>
+        <result property="syPremium" column="sy_premium" jdbcType="VARCHAR"/>
+        <result property="jyPremium" column="jy_premium" jdbcType="VARCHAR"/>
+        <result property="sumPremium" column="sum_premium" jdbcType="VARCHAR"/>
+        <result property="taxPremium" column="tax_premium" jdbcType="VARCHAR"/>
+        <result property="syPolicyNo" column="sy_policy_no" jdbcType="VARCHAR"/>
+        <result property="jqPolicyNo" column="jq_policy_no" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--订单 险种-->
@@ -200,7 +207,7 @@
         <association property="ordersExternal" column="{orderNo=id}" select="selectOrdersExternalFeeByOrderNo"/>
         <association property="insOrdersExternalPolicy" column="{orderNo=id}" select="selectExternalPolicyMap"/>
         <association property="vehicleAndVesselTaxVo" column="{orderNo=id}" select="selectOrdersTaxMap"/>
-        <association property="imagesAdds" column="{orderNo=id}" select="selectImageByOrderNo"/>
+        <association property="imagesAdds" column="{orderNo=quote_no}" select="selectImageByOrderNo"/>
         <collection property="insOrdersRiskList" column="{orderNo=id}" select="selectOrdersRisk"/>
         <collection property="insOrderAdjust" column="{orderNo=id}" select="selectOrderAdjust"/>
         <collection property="carUserInfoList" column="{orderNo=id}" select="selectCarUserInfo"/>
@@ -209,8 +216,15 @@
         <collection property="insOrdersPolicy" column="{orderNo=id}" select="selectOrdersPolicyByOrderNo"/>
         <collection property="accidentalDrivings" column="{orderNo=id}"
                     select="selectOrdersAccidentalDrivingByOrderNo"/>
+        <collection property="feeOrdersVo" column="{orderNo=id}"
+                    select="selectInsFeeOrderByOrderNo"/>
     </resultMap>
 
+    <select id="selectInsFeeOrderByOrderNo" resultType="com.jzg.commons.entity.vo.InsFeeOrdersVo">
+        SELECT * FROM ins_fee_orders WHERE order_no = #{orderNo}
+    </select>
+
+
     <resultMap id="InsOrdersAccidentalDrivingMap" type="com.jzg.commons.entity.orders.po.InsOrdersAccidentalDriving">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
@@ -522,6 +536,12 @@
             <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
                 AND o.quote_no = #{insOrdersParam.orderNo}
             </if>
+            <if test="insOrdersParam.parentId == 0 ">
+                AND o.parent_id = 0
+            </if>
+            <if test="insOrdersParam.parentId == 1 ">
+                AND o.parent_id != 0
+            </if>
             <if test="insOrdersParam.isTemporarily != null">
                 AND o.is_temporarily = #{insOrdersParam.isTemporarily}
             </if>
@@ -632,6 +652,7 @@
                issue_date,
                transfer_date,
                transfer,
+               transfer_bi,
                displacement
         from ins_orders_car_info
         where order_no = #{orderNo}
@@ -655,10 +676,19 @@
                ot.sy_adjust_rate,
                ot.tp_color_score,
                o.signing_time,
-               o.company_name
+               o.company_name,
+               co.jq_premium,
+               co.sy_premium,
+               co.jy_premium,
+               co.sum_premium,
+               co.tax_premium,
+               p.jq_policy_no,
+               p.sy_policy_no
         FROM ins_orders_other ot
                  LEFT JOIN ins_orders o ON o.quote_no = ot.order_no
-        where ot.order_no = #{orderNo}
+                 LEFT JOIN ins_orders_costs co ON co.order_no = ot.order_no
+                 LEFT JOIN ins_orders_policy p ON p.order_no = ot.order_no
+             where ot.order_no = #{orderNo}
     </select>
 
     <select id="getById" resultMap="InsOrdersVoMap">
@@ -1407,4 +1437,14 @@
         ORDER BY total_salesman_count DESC
     </select>
 
+
+    <select id="selectMainOrderNumber" resultType="java.lang.String">
+        SELECT IFNULL(
+               (SELECT o.id
+                FROM ins_orders o
+                         LEFT JOIN ins_orders_car_info c ON o.id = c.order_no
+                WHERE o.parent_id = 0 AND o.entry_status = 3 AND c.license_no = #{licenseNo} AND o.real_quote_user_id = #{realQuoteUserId} LIMIT 1),0
+        ) AS order_id
+    </select>
+
 </mapper>