Ver Fonte

修改紫金上传影响逻辑

guoweisong há 2 anos atrás
pai
commit
9ea31b6194

+ 44 - 0
src/main/java/com/ydtech/modules/fee/service/impl/FeeRuleSchemeServiceImpl.java

@@ -1282,11 +1282,15 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 jqOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
                 jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
                 jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums())+"元");
+                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getJqCostsProportion()));
                 jqFeePremium = insFeeOrder.getJqCostsPremiums();
             }else if(insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0  && insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()==0){//当为单商业务时
                 syOrderFeeVo = packageOrderFeeInfoOne(insFeeOrder);
                 syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
                 syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums())+"元");
+                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getSyCostsProportion()));
                 syFeePremium = insFeeOrder.getSyCostsPremiums();
             }else if(insFeeOrder.getJqPremium()!=null && insFeeOrder.getJqPremium().doubleValue()>0 && insFeeOrder.getSyPremium()!=null && insFeeOrder.getSyPremium().doubleValue()>0){//当为交商业务时
                 QueryOrderFeeVo queryOrderFeeVoTemp = packageOrderFeeInfoAll(insFeeOrder);
@@ -1294,11 +1298,15 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
                 jqOrderFeeVo = queryOrderFeeVoTemp.getJqCoderFeeVo();
                 jqOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getJqCostsPremiums()));
                 jqOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getJqCostsProportion()));
+                jqOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getJqSuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums().subtract(insFeeOrder.getJqSuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getJqCostsPremiums())+"元");
+                jqOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getJqSuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getJqCostsProportion().subtract(insFeeOrder.getJqSuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getJqCostsProportion()));
                 jqFeePremium = insFeeOrder.getJqCostsPremiums();
                 //获取商业险费用明细
                 syOrderFeeVo = queryOrderFeeVoTemp.getSyCoderFeeVo();
                 syOrderFeeVo.setCostsPremiums(convertToString(insFeeOrder.getSyCostsPremiums()));
                 syOrderFeeVo.setCostsProportion(convertToString(insFeeOrder.getSyCostsProportion()));
+                syOrderFeeVo.setCostsPremiumsAll(convertToString(insFeeOrder.getSySuperviseCostsPremiums())+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums().subtract(insFeeOrder.getSySuperviseCostsPremiums()))+"元 / "+convertToString(insFeeOrder.getSyCostsPremiums())+"元");
+                syOrderFeeVo.setCostsProportionAll(convertToString(insFeeOrder.getSySuperviseCostsProportion())+" / "+convertToString(insFeeOrder.getSyCostsProportion().subtract(insFeeOrder.getSySuperviseCostsProportion()))+" / "+convertToString(insFeeOrder.getSyCostsProportion()));
                 syFeePremium = insFeeOrder.getSyCostsPremiums();
 
             }
@@ -1328,6 +1336,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo1.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiums()!=null?syOrderFeeVo.getCostsPremiums():"-");
         feeResultVo1.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportion()!=null?fcOrderFeeVo.getCostsProportion():"-");
         feeResultVo1.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiums()!=null?fcOrderFeeVo.getCostsPremiums():"-");
+        feeResultVo1.setJqFeeRateAll(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsProportionAll()!=null?jqOrderFeeVo.getCostsProportionAll():"-");
+        feeResultVo1.setJqFeeAmountAll(jqOrderFeeVo!=null&&jqOrderFeeVo.getCostsPremiumsAll()!=null?jqOrderFeeVo.getCostsPremiumsAll():"-");
+        feeResultVo1.setSyFeeRateAll(syOrderFeeVo!=null&&syOrderFeeVo.getCostsProportionAll()!=null?syOrderFeeVo.getCostsProportionAll():"-");
+        feeResultVo1.setSyFeeAmountAll(syOrderFeeVo!=null&&syOrderFeeVo.getCostsPremiumsAll()!=null?syOrderFeeVo.getCostsPremiumsAll():"-");
+        feeResultVo1.setFcFeeRateAll(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsProportionAll()!=null?fcOrderFeeVo.getCostsProportionAll():"-");
+        feeResultVo1.setFcFeeAmountAll(fcOrderFeeVo!=null&&fcOrderFeeVo.getCostsPremiumsAll()!=null?fcOrderFeeVo.getCostsPremiumsAll():"-");
         resultList.add(feeResultVo1);
         //一级管理费用
         QueryOrderFeeResultVo feeResultVo2=new QueryOrderFeeResultVo();
@@ -1339,6 +1353,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo2.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFirstDeptPremiums()!=null?syOrderFeeVo.getFirstDeptPremiums():"-");
         feeResultVo2.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptProportion()!=null?fcOrderFeeVo.getFirstDeptProportion():"-");
         feeResultVo2.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFirstDeptPremiums()!=null?fcOrderFeeVo.getFirstDeptPremiums():"-");
+        feeResultVo2.setJqFeeRateAll(feeResultVo2.getJqFeeRate());
+        feeResultVo2.setJqFeeAmountAll(feeResultVo2.getJqFeeAmount());
+        feeResultVo2.setSyFeeRateAll(feeResultVo2.getSyFeeRate());
+        feeResultVo2.setSyFeeAmountAll(feeResultVo2.getSyFeeAmount());
+        feeResultVo2.setFcFeeRateAll(feeResultVo2.getFcFeeRate());
+        feeResultVo2.setFcFeeAmountAll(feeResultVo2.getFcFeeAmount());
         resultList.add(feeResultVo2);
         //二级管理费用
         QueryOrderFeeResultVo feeResultVo3=new QueryOrderFeeResultVo();
@@ -1350,6 +1370,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo3.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getSecondDeptPremiums()!=null?syOrderFeeVo.getSecondDeptPremiums():"-");
         feeResultVo3.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptProportion()!=null?fcOrderFeeVo.getSecondDeptProportion():"-");
         feeResultVo3.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getSecondDeptPremiums()!=null?fcOrderFeeVo.getSecondDeptPremiums():"-");
+        feeResultVo3.setJqFeeRateAll(feeResultVo3.getJqFeeRate());
+        feeResultVo3.setJqFeeAmountAll(feeResultVo3.getJqFeeAmount());
+        feeResultVo3.setSyFeeRateAll(feeResultVo3.getSyFeeRate());
+        feeResultVo3.setSyFeeAmountAll(feeResultVo3.getSyFeeAmount());
+        feeResultVo3.setFcFeeRateAll(feeResultVo3.getFcFeeRate());
+        feeResultVo3.setFcFeeAmountAll(feeResultVo3.getFcFeeAmount());
         resultList.add(feeResultVo3);
         //三级管理费用
         QueryOrderFeeResultVo feeResultVo4=new QueryOrderFeeResultVo();
@@ -1361,6 +1387,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo4.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getThirdDeptPremiums()!=null?syOrderFeeVo.getThirdDeptPremiums():"-");
         feeResultVo4.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptProportion()!=null?fcOrderFeeVo.getThirdDeptProportion():"-");
         feeResultVo4.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getThirdDeptPremiums()!=null?fcOrderFeeVo.getThirdDeptPremiums():"-");
+        feeResultVo4.setJqFeeRateAll(feeResultVo4.getJqFeeRate());
+        feeResultVo4.setJqFeeAmountAll(feeResultVo4.getJqFeeAmount());
+        feeResultVo4.setSyFeeRateAll(feeResultVo4.getSyFeeRate());
+        feeResultVo4.setSyFeeAmountAll(feeResultVo4.getSyFeeAmount());
+        feeResultVo4.setFcFeeRateAll(feeResultVo4.getFcFeeRate());
+        feeResultVo4.setFcFeeAmountAll(feeResultVo4.getFcFeeAmount());
         resultList.add(feeResultVo4);
         //四级管理费用
         QueryOrderFeeResultVo feeResultVo5=new QueryOrderFeeResultVo();
@@ -1372,6 +1404,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo5.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getForthDeptPremiums()!=null?syOrderFeeVo.getForthDeptPremiums():"-");
         feeResultVo5.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptProportion()!=null?fcOrderFeeVo.getForthDeptProportion():"-");
         feeResultVo5.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getForthDeptPremiums()!=null?fcOrderFeeVo.getForthDeptPremiums():"-");
+        feeResultVo5.setJqFeeRateAll(feeResultVo5.getJqFeeRate());
+        feeResultVo5.setJqFeeAmountAll(feeResultVo5.getJqFeeAmount());
+        feeResultVo5.setSyFeeRateAll(feeResultVo5.getSyFeeRate());
+        feeResultVo5.setSyFeeAmountAll(feeResultVo5.getSyFeeAmount());
+        feeResultVo5.setFcFeeRateAll(feeResultVo5.getFcFeeRate());
+        feeResultVo5.setFcFeeAmountAll(feeResultVo5.getFcFeeAmount());
         resultList.add(feeResultVo5);
         //五级管理费用
         QueryOrderFeeResultVo feeResultVo6=new QueryOrderFeeResultVo();
@@ -1383,6 +1421,12 @@ public class FeeRuleSchemeServiceImpl implements FeeRuleSchemeService {
         feeResultVo6.setSyFeeAmount(syOrderFeeVo!=null&&syOrderFeeVo.getFifthDeptPremiums()!=null?syOrderFeeVo.getFifthDeptPremiums():"-");
         feeResultVo6.setFcFeeRate(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptProportion()!=null?fcOrderFeeVo.getFifthDeptProportion():"-");
         feeResultVo6.setFcFeeAmount(fcOrderFeeVo!=null&&fcOrderFeeVo.getFifthDeptPremiums()!=null?fcOrderFeeVo.getFifthDeptPremiums():"-");
+        feeResultVo6.setJqFeeRateAll(feeResultVo6.getJqFeeRate());
+        feeResultVo6.setJqFeeAmountAll(feeResultVo6.getJqFeeAmount());
+        feeResultVo6.setSyFeeRateAll(feeResultVo6.getSyFeeRate());
+        feeResultVo6.setSyFeeAmountAll(feeResultVo6.getSyFeeAmount());
+        feeResultVo6.setFcFeeRateAll(feeResultVo6.getFcFeeRate());
+        feeResultVo6.setFcFeeAmountAll(feeResultVo6.getFcFeeAmount());
         resultList.add(feeResultVo6);
         //一级分销费
         QueryOrderFeeResultVo feeResultVo7=new QueryOrderFeeResultVo();

+ 4 - 3
src/main/java/com/ydtech/modules/order/controller/InsOrdersController.java

@@ -41,7 +41,8 @@ public class InsOrdersController extends BaseController {
 
     private final InsAccidentalDrivingService insAccidentalDrivingService;
 
-    public InsOrdersController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService, InsOrdersComponents insOrdersComponents, InsAccidentalDrivingService insAccidentalDrivingService) {
+    public InsOrdersController(InsAreaCompanyService insAreaCompanyService, InsOrdersService insOrdersService,
+                               InsOrdersComponents insOrdersComponents, InsAccidentalDrivingService insAccidentalDrivingService) {
         this.insAreaCompanyService = insAreaCompanyService;
         this.insOrdersService = insOrdersService;
         this.insOrdersComponents = insOrdersComponents;
@@ -51,8 +52,8 @@ public class InsOrdersController extends BaseController {
     @GetMapping("/getAgreementInsCompany")
     @ApiOperation(value = "获取协议报价保险公司")
     public HttpResult<List<PtlAgreementInsCompanyDto>> getAgreementInsCompany(@RequestParam(required = false) String deptId) {
-        if(StringUtils.isEmpty(deptId)){
-            deptId=getDeptId();
+        if (StringUtils.isEmpty(deptId)) {
+            deptId = getDeptId();
         }
         return this.insOrdersService.getAgreementInsCompany(deptId);
     }

+ 1 - 48
src/main/java/com/ydtech/modules/order/entity/crawler/response/CrawlerAuditResponse.java

@@ -23,11 +23,6 @@ public class CrawlerAuditResponse extends CrawlerBaseResponse {
      */
     @JsonProperty("JQ_Policy")
     private String jqPolicy;
-//    /**
-//     * 驾意险
-//     */
-//    @JsonProperty("drivingInsurances")
-//    private List<DrivingInsurance> drivingInsurances;
 
     /**
      * 商业险投保单号
@@ -41,49 +36,7 @@ public class CrawlerAuditResponse extends CrawlerBaseResponse {
     @JsonProperty("pay_url")
     private String payUrl;
 
-//    public List<DrivingInsuranceDto> getDrivingInsuranceDto() {
-//        if (drivingInsurances == null) {
-//            return Collections.emptyList();
-//        }
-//
-//        return drivingInsurances.stream().map(DrivingInsurance::toDrivingInsuranceDto).collect(Collectors.toList());
-//    }
-//
-//    @Data
-//    public static class DrivingInsurance implements Serializable {
-//
-//        private static final long serialVersionUID = -1316826976645101919L;
-//        /**
-//         * 驾意险投保单号
-//         */
-//        @JsonProperty("policy")
-//        private String policy;
-//        /**
-//         * 驾意险保单号
-//         */
-//        @JsonProperty("application")
-//        private String application;
-//        /**
-//         * 驾意险名称
-//         */
-//        @JsonProperty("name")
-//        private String name;
-//        /**
-//         * 驾意险编号
-//         */
-//        @JsonProperty("code")
-//        private String code;
-//
-//        private DrivingInsuranceDto toDrivingInsuranceDto() {
-//            DrivingInsuranceDto drivingInsuranceDto = new DrivingInsuranceDto();
-//            drivingInsuranceDto.setCode(code);
-//            drivingInsuranceDto.setName(name);
-//            drivingInsuranceDto.setPolicyNumber(policy);
-//            drivingInsuranceDto.setApplicationNumber(application);
-//            return drivingInsuranceDto;
-//        }
-//
-//    }
+
 
 
 }

+ 11 - 0
src/main/java/com/ydtech/modules/order/entity/vo/OrderFeeVo.java

@@ -26,6 +26,17 @@ public class OrderFeeVo implements Serializable {
     @JsonProperty("costsPremiums")
     private String costsPremiums;
 
+    /**
+     * 费用比例
+     */
+    @JsonProperty("costsProportionAll")
+    private String costsProportionAll;
+    /**
+     * 总费用
+     */
+    @JsonProperty("costsPremiumsAll")
+    private String costsPremiumsAll;
+
     /**
      * 一级机构管理费比例
      */

+ 14 - 0
src/main/java/com/ydtech/modules/order/entity/vo/QueryOrderFeeResultVo.java

@@ -21,4 +21,18 @@ public class QueryOrderFeeResultVo {
     private String fcFeeRate;
     @ApiModelProperty("非车费用金额")
     private String fcFeeAmount;
+
+    @ApiModelProperty("交强费用比例(手续费比例/跟单飞比例/总比例)")
+    private String jqFeeRateAll;
+    @ApiModelProperty("交强费用金额(手续费金额/跟单费用金额/总金额)")
+    private String jqFeeAmountAll;
+    @ApiModelProperty("商业费用比例(手续费比例/跟单飞比例/总比例)")
+    private String syFeeRateAll;
+    @ApiModelProperty("商业费用金额(手续费金额/跟单费用金额/总金额)")
+    private String syFeeAmountAll;
+    @ApiModelProperty("非车费用比例(手续费比例/跟单飞比例/总比例)")
+    private String fcFeeRateAll;
+    @ApiModelProperty("非车费用金额(手续费金额/跟单费用金额/总金额)")
+    private String fcFeeAmountAll;
+
 }

+ 8 - 1
src/main/java/com/ydtech/modules/order/service/InsTaskImagesService.java

@@ -36,6 +36,10 @@ public interface InsTaskImagesService extends IService<InsTaskImages> {
      */
     HttpResult<Map<String, InsTaskImagesDto>> findByQuoteNo(String quoteNo);
 
+
+
+    List<InsTaskImagesBase64> findByOrderNo(String orderNo, String companyId, boolean b);
+
     /**
      * 获取文件的 文件的Base64 编码
      *
@@ -43,7 +47,10 @@ public interface InsTaskImagesService extends IService<InsTaskImages> {
      * @param companyId 子订单好
      * @return
      */
-    List<InsTaskImagesBase64> findByOrderNo(String orderNo, String companyId);
+    default List<InsTaskImagesBase64> findByOrderNo(String orderNo, String companyId){
+        return findByOrderNo(orderNo, companyId, false);
+    }
+
 
     /**
      * 获取文件路径信息

+ 2 - 6
src/main/java/com/ydtech/modules/order/service/impl/InsCrawlerOrderServiceImpl.java

@@ -1,7 +1,6 @@
 package com.ydtech.modules.order.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.ydtech.constants.enums.InsurKind;
 import com.ydtech.constants.enums.dict.InsOrderStatusEnum;
 import com.ydtech.core.page.HttpResult;
@@ -132,7 +131,8 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         // 请求地址
         String apiUrl = ptlCrawlerApiService.getApiUrl(insAreaCompany.getAgreementId(), PtlCrawlerApiType.API_3);
         // 获取缓存中的影像信息
-        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insAreaCompany.getOrderno(), insAreaCompany.getId());
+        List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insAreaCompany.getOrderno(),
+                insAreaCompany.getId(), true);
 
         if (insTaskImagesBase64s.isEmpty()) {
             return HttpResult.ok("上传成功");
@@ -169,10 +169,6 @@ public class InsCrawlerOrderServiceImpl implements InsCrawlerOrderService {
         insAreaCompany.setJqapplyno(crawlerAuditResponse.getJqPolicy());
         insAreaCompany.setSyapplyno(crawlerAuditResponse.getSyPolicy());
 
-        // 交叉销售
-//        List<DrivingInsuranceDto> drivingInsuranceDto = crawlerAuditResponse.getDrivingInsuranceDto();
-//        insAreaCompany.setCrossInsurance(JSON.parseArray(JSON.toJSONString(drivingInsuranceDto)));
-
         insAreaCompany.setOrderstatus(InsOrderStatusEnum.WAIT_PAY.getCode());
         insAreaCompanyService.updateCompanyAndOrders(insAreaCompany);
         return HttpResult.ok("核保成功");

+ 12 - 2
src/main/java/com/ydtech/modules/order/service/impl/InsTaskImagesServiceImpl.java

@@ -76,7 +76,7 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
     }
 
     @Override
-    public List<InsTaskImagesBase64> findByOrderNo(String orderNo, String companyId) {
+    public List<InsTaskImagesBase64> findByOrderNo(String orderNo, String companyId, boolean b) {
 
         // 获取缓存中的影像信息
         JSONObject uploadImage = insImagesUploadCacheComponents.isUploadImage(companyId);
@@ -101,13 +101,23 @@ public class InsTaskImagesServiceImpl extends ServiceImpl<InsTaskImagesMapper, I
             map.put(target.getImageId(), base64B);
         }
 
-        return insUploadImagesDtos.stream()
+        List<InsTaskImagesBase64> collect = insUploadImagesDtos.stream()
                 // 过滤缓存中 存在的 imageId
                 .filter(x -> !x.getImageId().equals(uploadImage.get(x.getImageType())))
                 .map(x -> new InsTaskImagesBase64(x, map))
                 .collect(Collectors.toList());
+
+        // 核心逻辑是否是覆盖
+        if (!collect.isEmpty() && b) {
+            return insUploadImagesDtos.stream()
+                    .map(x -> new InsTaskImagesBase64(x, map))
+                    .collect(Collectors.toList());
+        }
+        return collect;
+
     }
 
+
     @Override
     public List<InsUploadImagesDto> findImageByOrderNo(String orderNo, String companyId) {
         JSONObject uploadImage = insImagesUploadCacheComponents.isUploadImage(companyId);

+ 2 - 4
src/main/java/com/ydtech/modules/order/service/impl/ZijinOrderApiServiceImpl.java

@@ -261,6 +261,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         // 1 通过 协议id获取配置实体
         HttpHeaders httpHeaders = zijinRequestApiComponents.getHttpHeaders(insAreaCompany.getAgreementId());
         InsOrders insOrders = insOrdersService.getById(insAreaCompany.getOrderno());
+
         List<InsTaskImagesBase64> insTaskImagesBase64s = insTaskImagesService.findByOrderNo(insOrders.getOrderno(), insAreaCompany.getId());
         if (insTaskImagesBase64s.isEmpty()) {
             return HttpResult.ok();
@@ -286,9 +287,6 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
                 insAreaCompany.getInsOrderNo());
         BaseResponse baseResponse = zijinRequestApiComponents.uploadImageInfoList(uploadImageInfoListRequest,
                 httpHeaders);
-        // 将上传的数据存入缓存
-        insImagesUploadCacheComponents.setUploadImageCache(companyId, insTaskImagesBase64s);
-
         return HttpResult.ok(baseResponse.getRtnMsg());
     }
 
@@ -308,7 +306,7 @@ public class ZijinOrderApiServiceImpl implements ZijinOrderApiService {
         String busNo;
         BusType busType;
         String identifyNo = customerInfoVo.getIdentifyNumber();
-        String templateName = "";
+        String templateName;
         switch (policyPrintVo.getRiskCode()) {
             case InsuranceRisk.TRAFFIC_CODE:
                 busNo = insAreaCompany.getJqpolicyno();