国任修改过户字段

保险公司排序

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
@@ -89,6 +90,8 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     SysUserService sysUserService;
     @Autowired
     private SysSystemMapper sysSystemMapper;
+    @Autowired
+    private EsmInsCompanyTenantSortMapper esmInsCompanyTenantSortMapper;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -648,7 +651,23 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         companyList = companyList.stream().filter(x -> Objects.nonNull(x.getAgreements()) && !x.getAgreements().isEmpty()).collect(Collectors.toList());
 
         log.info("租户匹配到的保司个数[{}]",CollUtil.size(companyList));
-        return companyList;
+
+        List<EsmInsCompanyTenantSort> sortList = esmInsCompanyTenantSortMapper.selectList(
+                Wrappers.lambdaQuery(EsmInsCompanyTenantSort.class)
+                        .eq(EsmInsCompanyTenantSort::getIsDelete, 0)
+                        .orderByAsc(EsmInsCompanyTenantSort::getOrderNum)
+        );
+
+        List<EsmInsCompany> finalCompanyList1 = companyList;
+        List<EsmInsCompany> finalCompanyList = sortList.stream()
+                .map(EsmInsCompanyTenantSort::getCompanyId)
+                .flatMap(companyId -> finalCompanyList1.stream()
+                        .filter(company -> companyId.equals(company.getId()))
+                        .limit(1)
+                )
+                .collect(Collectors.toList());
+
+        return finalCompanyList;
     }
 
 }

tenant/insurance/quotation-guoren/src/main/java/com/jzg/quotation/guoren/crawler/entity/request/GuoRenCrawlerGetCarPriceRequest.java

@@ -630,9 +630,9 @@ public class GuoRenCrawlerGetCarPriceRequest {
         this.carIdentifyType = "01";
         this.rateCode = "20";
         this.loanVehicleFlag = "0";
-        this.chgOwnerFlag =String.valueOf(otherInfo.getTransfer());
-        this.ciChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
-        this.biChgOwnerFlag = String.valueOf(otherInfo.getTransfer());
+        this.chgOwnerFlag =String.valueOf(carInfoVo.isTransfer() ? 1 : 0);
+        this.ciChgOwnerFlag = String.valueOf(carInfoVo.isTransfer() ? 1 : 0);
+        this.biChgOwnerFlag = String.valueOf(carInfoVo.isTransfer() ? 1 : 0);
         this.newDeviceFlag = "0";
         this.chargingpostFlag = "0";
         this.productType = "0101";

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

@@ -525,19 +525,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
                 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));
-                }
+//                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));
+//                }
             });
         }
         // 订单电子保单信息
@@ -1687,24 +1687,6 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
                 continue;
             }
             log.info("车险订单[{}]对应的订单明细是[{}]", orderNo, JSONUtil.toJsonStr(oldInsOrders));
-
-//            if (Objects.nonNull(batchModifyVo.getJqSuperviseCostsProportion()) && batchModifyVo.getJqSuperviseCostsProportion().compareTo(BigDecimal.ZERO) > 0) {
-//                BigDecimal superviseReceivablePremium = multiply(new BigDecimal(Objects.toString(insFeeOrders.getJqPremium(),"0") ), batchModifyVo.getJqSuperviseCostsProportion());
-//                insFeeOrdersMapper.update(null, new LambdaUpdateWrapper<InsFeeOrders>()
-//                        .set(InsFeeOrders::getJqSuperviseCostsProportion, batchModifyVo.getJqSuperviseCostsProportion())
-//                        .set(InsFeeOrders::getJqSuperviseCostsPremiums, superviseReceivablePremium)
-//                        .eq(InsFeeOrders::getOrderNo,orderNo));
-//            }
-
-//            if (Objects.nonNull(batchModifyVo.getSySuperviseCostsProportion()) && batchModifyVo.getSySuperviseCostsProportion().compareTo(BigDecimal.ZERO) > 0) {
-//                BigDecimal otherReceivablePremium = multiply(new BigDecimal(Objects.toString(insFeeOrders.getSyPremium(),"0")), batchModifyVo.getSySuperviseCostsProportion());
-//                baseMapper.update(null, new LambdaUpdateWrapper<InsFeeOrders>()
-//                        .set(InsFeeOrders::getSySuperviseCostsProportion, batchModifyVo.getSySuperviseCostsProportion())
-//                        .set(InsFeeOrders::getSySuperviseCostsPremiums, otherReceivablePremium)
-//                        .eq(InsFeeOrders::getOrderNo,orderNo));
-//            }
-
-
             if(batchModifyVo.getSigningTime() != null){
                 baseMapper.update(null, new LambdaUpdateWrapper<InsOrders>()
                         .set(InsOrders::getSigningTime, batchModifyVo.getSigningTime())