Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -1,6 +1,6 @@
 package com.jzg.commons.entity.dto;
 
-import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.commons.entity.vo.ChangeLogDetail;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -91,5 +91,5 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     private String leaderName;
 
     @Schema(description = "审核记录列表")
-    private List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList;
+    private List<ChangeLogDetail> sysUserJzgInfoBankCardRecordList;
 }

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

@@ -26,6 +26,12 @@ public class ChangeLogDetail implements Serializable {
     @Schema(name = "审核说明")
     private String content;
 
+    @Schema(name = "银行卡ID")
+    private String bankCardId;
+
+    @Schema(name = "id")
+    private String id;
+
     public ChangeLogDetail(){
 
     }
@@ -37,4 +43,13 @@ public class ChangeLogDetail implements Serializable {
         this.content = content;
     }
 
+    public ChangeLogDetail(String title, LocalDateTime time, Boolean show, String content, String bankCardId, String id) {
+        this.title = title;
+        this.time = time;
+        this.show = show;
+        this.content = content;
+        this.bankCardId = bankCardId;
+        this.id = id;
+    }
+
 }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -874,7 +874,7 @@ public class UnifyOrderManager {
         try {
             quoteService.uploadImage(insuranceUploadImageVo);
         }catch (Exception e){
-            throw new SystemException("影像上传异常,请检查影像");
+            throw new SystemException("影像上传异常,请检查影像是否上传或影像是否清晰");
         }
         return HttpResult.ok();
     }

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/component/ZhongAnCrawlerRequestComponent.java

@@ -273,8 +273,8 @@ public class ZhongAnCrawlerRequestComponent {
 
     public String markCompleted(ZhongAnCrawlerMarkRequest markRequest, HttpHeaders headers) {
         InsuranceLog.infoLog(InsuranceEnum.ZAPA.getPinyin(), "\n\t---------> {} \n\t---------> URl: {} \n\t---------> 请求参数:{}",
-                "众安爬虫影像提交接口",RequestUrl.MARK_COMPLETED.getRequestUrl(zhongAnCrawlerProperties.getBaseUrl()), JSON.toJSONString(markRequest));
-        return requestComponent.formDataString(RequestUrl.MARK_COMPLETED.getRequestUrl(zhongAnCrawlerProperties.getBaseUrl()), markRequest, headers,"影像提交");
+                "众安爬虫核保提交",RequestUrl.MARK_COMPLETED.getRequestUrl(zhongAnCrawlerProperties.getBaseUrl()), JSON.toJSONString(markRequest));
+        return requestComponent.formDataString(RequestUrl.MARK_COMPLETED.getRequestUrl(zhongAnCrawlerProperties.getBaseUrl()), markRequest, headers,"核保提交");
     }
 
     public ZhongAnCrawlerPolicyListResponse policyList(ZhongAnCrawlerPolicyListRequest policyListRequest, HttpHeaders headers) {

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/entity/request/ZhongAnCrawlerApplyAccommodationRequest.java

@@ -58,7 +58,7 @@ public class ZhongAnCrawlerApplyAccommodationRequest {
     @JsonProperty("flag")
     private String flag;
 
-    public ZhongAnCrawlerApplyAccommodationRequest(Long id, String quoteId, String identityNo, String orderNo, ZhongAnCrawlerConfigureParameters parameters) {
+    public ZhongAnCrawlerApplyAccommodationRequest(Long id, String quoteId, String identityNo, String orderNo, Map<String, String> fileMap,ZhongAnCrawlerConfigureParameters parameters) {
         this.id = id;
         this.quoteId = quoteId;
         this.phoneNo = "";
@@ -66,8 +66,6 @@ public class ZhongAnCrawlerApplyAccommodationRequest {
         this.auditStatus = "1";
         this.identityNo = identityNo;
         this.orderNo = orderNo;
-        Map<String, String> fileMap = new HashMap<>();
-        fileMap.put("version","2");
         this.fileMap = fileMap;
         this.location = "";
         this.flowId = parameters.getFlowId();

tenant/insurance/quotation-zhongan/src/main/java/com/jzg/quotation/zhongan/crawler/service/Impl/ZhongAnCrawlerRequestImpl.java

@@ -424,18 +424,29 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
         ZhongAnCrawlerQueryAccommodationRequest queryAccommodationRequest = new ZhongAnCrawlerQueryAccommodationRequest(zhongAnCrawlerOrder.getQuoteId(), parameters);
         ZhongAnCrawlerQueryAccommodationResponse queryAccommodationResponse = zhongAnCrawlerRequestComponent.queryAccommodation(queryAccommodationRequest, headers);
         boolean queryAccommodation = queryAccommodationResponse.getSuccess();
+        Map<String, String> fileMap = new HashMap<>();
         for (InsuranceImageVo insuranceImageVo : insuranceUploadImageVo.getImageVoList()) {
             //C01行驶证正面，C02车主身份证正面，D01行驶证反面 D02 车主身份证反面
             switch (insuranceImageVo.getImageCode()) {
                 case "C01" -> {
                     String imageType = "6";
                     InsuranceImageVo.ImageDTO imageDTO = insuranceImageVo.getImageBase64List().get(0);
-                    extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                    if (!queryAccommodation) {
+                        extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                    } else {
+                       ZhongAnCrawlerAccommodationUploadResponse accommodationUpload = accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        fileMap.put("6", accommodationUpload.getValue().getDatas().getAttachment());
+                    }
                 }
                 case "C02" -> {
                     String imageType = "4";
                     InsuranceImageVo.ImageDTO imageDTO = insuranceImageVo.getImageBase64List().get(0);
-                    extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                    if (!queryAccommodation) {
+                        extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                    } else {
+                       ZhongAnCrawlerAccommodationUploadResponse accommodationUploadResponse = accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                       fileMap.put("4", accommodationUploadResponse.getValue().getDatas().getAttachment());
+                    }
                 }
                 case "D01" -> {
                     String imageType = "7";
@@ -443,7 +454,8 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
                     if (!queryAccommodation) {
                         extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
                     } else {
-                        accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        ZhongAnCrawlerAccommodationUploadResponse accommodationUploadResponse = accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        fileMap.put("7", accommodationUploadResponse.getValue().getDatas().getAttachment());
                     }
                 }
                 case "D02" -> {
@@ -452,7 +464,8 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
                     if (!queryAccommodation) {
                         extracted(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
                     } else {
-                        accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        ZhongAnCrawlerAccommodationUploadResponse accommodationUploadResponse = accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        fileMap.put("3", accommodationUploadResponse.getValue().getDatas().getAttachment());
                     }
 
                 }
@@ -460,11 +473,21 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
                     String imageType = "99";
                     List<InsuranceImageVo.ImageDTO> imageBase64List = insuranceImageVo.getImageBase64List();
                     for (InsuranceImageVo.ImageDTO imageDTO : imageBase64List) {
-                        accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        ZhongAnCrawlerAccommodationUploadResponse accommodationUploadResponse = accommodationUpload(parameters, headers, zhongAnCrawlerOrder, imageType, imageDTO);
+                        fileMap.put("99", accommodationUploadResponse.getValue().getDatas().getAttachment());
                     }
                 }
             }
-
+        }
+        if (queryAccommodation) {
+            fileMap.put("version","2");
+            Long id = queryAccommodationResponse.getValue().getDatas().getAccommodation().getId();
+            String identityNo = queryAccommodationResponse.getValue().getDatas().getAccommodation().getIdentityNo();
+            ZhongAnCrawlerApplyAccommodationRequest applyAccommodationRequest = new ZhongAnCrawlerApplyAccommodationRequest(id, zhongAnCrawlerOrder.getQuoteId(), identityNo, zhongAnCrawlerOrder.getOrderNo(), fileMap, parameters);
+            ZhongAnCrawlerApplyAccommodationResponse applyAccommodationResponse = zhongAnCrawlerRequestComponent.applyAccommodation(applyAccommodationRequest, headers);
+            if (applyAccommodationResponse.getSuccess()) {
+                log.info("通融提交成功");
+            }
         }
     }
 
@@ -494,12 +517,13 @@ public class ZhongAnCrawlerRequestImpl implements ZhongAnCrawlerRequest {
         }
     }
 
-    private void accommodationUpload (ZhongAnCrawlerConfigureParameters parameters, HttpHeaders headers, ZhongAnCrawlerOrder zhongAnCrawlerOrder, String imageType, InsuranceImageVo.ImageDTO imageDTO) {
+    private ZhongAnCrawlerAccommodationUploadResponse accommodationUpload (ZhongAnCrawlerConfigureParameters parameters, HttpHeaders headers, ZhongAnCrawlerOrder zhongAnCrawlerOrder, String imageType, InsuranceImageVo.ImageDTO imageDTO) {
         ZhongAnCrawlerAccommodationUploadRequest accommodationUploadRequest = new ZhongAnCrawlerAccommodationUploadRequest(imageType, imageDTO, zhongAnCrawlerOrder.getOrderNo(), parameters);
         ZhongAnCrawlerAccommodationUploadResponse accommodationUploadResponse = zhongAnCrawlerRequestComponent.accommodationUpload(accommodationUploadRequest, headers);
         if (accommodationUploadResponse.getSuccess()) {
             log.info("影像" + imageType + "：上传成功");
         }
+        return accommodationUploadResponse;
     }
 
     public byte[] convert(String filePath) throws IOException {

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoBankCardServiceImpl.java

@@ -13,6 +13,7 @@ import com.jzg.commons.entity.dto.SysUserJzgInfoBankCardDto;
 import com.jzg.commons.entity.po.SysUploadFiles;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCard;
 import com.jzg.commons.entity.po.SysUserJzgInfoBankCardRecord;
+import com.jzg.commons.entity.vo.ChangeLogDetail;
 import com.jzg.commons.entity.vo.SysUserJzgInfoBankCardVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.commons.util.MinioUtils;
@@ -119,7 +120,10 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
             List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
                     .selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
                             .eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
-            sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(sysUserJzgInfoBankCardRecordList);
+            List<ChangeLogDetail> changeLogDetailList = sysUserJzgInfoBankCardRecordList.stream()
+                    .map(action -> new ChangeLogDetail(action.getDescription(), action.getCreateTime(), action.getStatus().equals("1"), action.getRemark(), action.getBankCardId(), action.getId()))
+                    .collect(Collectors.toList());
+            sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(changeLogDetailList);
             // 填充最新的驳回日期和驳回原因
             if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
                 // 过滤出状态=2的驳回记录，并按创建时间 倒序排列
@@ -173,6 +177,11 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
 
     @Override
     public boolean setDefaultCard(SysUserJzgInfoBankCardVo sysUserJzgInfoBankCardVo) {
+        SysUserJzgInfoBankCard bankCard = sysUserJzgInfoBankCardMapper.selectById(sysUserJzgInfoBankCardVo.getId());
+        if (bankCard.getAuditStatus() != 1) {
+            throw new SystemException("该银行卡未审核通过");
+        }
+
         // 1. 将该用户所有银行卡取消默认（批量更新，避免逐条 updateById 受 FieldStrategy 影响）
         LambdaUpdateWrapper<SysUserJzgInfoBankCard> cancelWrapper = new LambdaUpdateWrapper<>();
         cancelWrapper.eq(SysUserJzgInfoBankCard::getUserInfoId, sysUserJzgInfoBankCardVo.getUserId())