Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -1914,7 +1914,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                     .eq(SysUser::getDeptId, "9914D18")
                     .isNotNull(SysUser::getLeaderId);
             userList.addAll(list(getOperationUser));
-        } else if ("9914D18".equals(landerInfo.getDeptId())) {
+        } else if ("9914D18".equals(landerInfo.getDeptId()) || "9914D13".equals(landerInfo.getDeptId())) {
             //查询登陆者组长信息
             List<SysUser> sysUsers = super.baseMapper.selectLeaderBylanderInfo(landerInfo.getDeptId(), null, landerInfo.getLeaderId());
             if (StringUtils.isNullOrEmpty(sysUsers) || sysUsers.size() < 1) {

src/main/java/com/ydtech/modules/ins/model/yc/imageUp/ImageUp.java

@@ -138,6 +138,9 @@ public class ImageUp {
             }else if (imgType.equals(InsuranceImageEnum.D04.getCode())) {
                 fileName = "被保人身份证" + "（反面）" + ".jpg";
                 rb.setImgtype("UW01008");
+            } else if (imgType.equals(InsuranceImageEnum.GX00.getCode())) {
+                fileName = "投保人被保人信息不一致说明" + ".jpg";
+                rb.setImgtype("UW01017");
             }
 
         }

src/main/java/com/ydtech/modules/order/entity/api/yangguang/request/YangGuangUpLoadRequest.java

@@ -23,9 +23,9 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
     @JSONField(name = "Body")
     private Body Body;
 
-    public YangGuangUpLoadRequest(String InfotransNo, InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles) {
+    public YangGuangUpLoadRequest(String InfotransNo, InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles,String apiUrl) {
         this.Head = new Head();
-        this.Body = new Body(InfotransNo,insTaskImagesBase64, parameters,insUploadFiles);
+        this.Body = new Body(InfotransNo,insTaskImagesBase64, parameters,insUploadFiles,apiUrl);
     }
 
     @Data
@@ -51,8 +51,8 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
         @JSONField(name = "imageInfo")
         private imageInfo imageInfo;
 
-        public Body(String InfotransNo,InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters,InsUploadFiles insUploadFiles) {
-           this.imageInfo = new imageInfo(InfotransNo, insTaskImagesBase64, parameters,insUploadFiles);
+        public Body(String InfotransNo,InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters,InsUploadFiles insUploadFiles,String apiUrl) {
+           this.imageInfo = new imageInfo(InfotransNo, insTaskImagesBase64, parameters,insUploadFiles,apiUrl);
         }
         @Data
         public static class imageInfo implements Serializable {
@@ -83,13 +83,13 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
             @JSONField(name = "insuranceImageList")
             private List<insuranceImageList> insuranceImageList;
 
-            public imageInfo(String InfotransNo,InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles) {
+            public imageInfo(String InfotransNo,InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles,String apiUrl) {
                 this.caseNo = InfotransNo;
                 this.appCode = "CARAPPLY";
                 this.caseSource = "0";
                 this.fileServer = "0";
                 this.ifNationwideQuick = "0";
-                this.insuranceImageList = Arrays.asList(new insuranceImageList(insTaskImagesBase64,parameters,insUploadFiles));
+                this.insuranceImageList = Arrays.asList(new insuranceImageList(insTaskImagesBase64,parameters,insUploadFiles,apiUrl));
             }
 
             @NoArgsConstructor
@@ -134,9 +134,9 @@ public class YangGuangUpLoadRequest extends YangGuangBaseRequest{
                 @JSONField(name = "exifInfo")
                 private String exifInfo;
 
-                public insuranceImageList(InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles) {
+                public insuranceImageList(InsTaskImagesBase64 insTaskImagesBase64, YangGuangConfigureParameters parameters, InsUploadFiles insUploadFiles, String apiUrl) {
                     String suffix = insTaskImagesBase64.getFileName().substring(insTaskImagesBase64.getFileName().lastIndexOf("."));
-                    this.imageUrl = "https://test.baoxianzhanggui.com/web-api" + insUploadFiles.getUrl();
+                    this.imageUrl = apiUrl + insUploadFiles.getUrl();
                     this.imageType = "01";
                     this.referer = "SXJZG";
                     this.userNo = parameters.getHandlerCode();

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

@@ -283,9 +283,6 @@ public class InsOrderPdfUrlServiceImpl extends ServiceImpl<InsOrderPdfUrlMapper,
             if (subOrder.getApiType()!=null && subOrder.getApiType() == 1) {
                 return yangGuangOrderApiService.getPolicyByCompanyIdPdfList(subOrder,insOrders,flag);
             }
-//            else if (subOrder.getApiType() != null && subOrder.getApiType() == 2) {
-//                return insCrawlerOrderService.getPolicyByCompanyIdPdfList(subOrder,insOrders,flag);
-//            }
         }
         //平安财险   上线再调式
         else if(subOrder.getCompanyId().contains(InsuranceEnum.PAIC.getCode())){

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

@@ -206,7 +206,7 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
             for (InsTaskImagesBase64 insTaskImagesBase64 : insTaskImagesBase64s) {
                 ObjectMapper objectMapper = new ObjectMapper();
                 InsUploadFiles insUploadFiles = insUploadFilesService.queryById(insTaskImagesBase64.getImageId());
-                YangGuangUpLoadRequest yangGuangUpLoadRequest = new YangGuangUpLoadRequest(InfotransNo, insTaskImagesBase64, parameters, insUploadFiles);
+                YangGuangUpLoadRequest yangGuangUpLoadRequest = new YangGuangUpLoadRequest(InfotransNo, insTaskImagesBase64, parameters, insUploadFiles,apiUrl);
                 String json = objectMapper.writeValueAsString(yangGuangUpLoadRequest);
                 String yangGuangUpLoadResponse = yangGuangRequestApiComponents.upload(json);
                 log.info("上传影像：{}", yangGuangUpLoadResponse);
@@ -485,7 +485,7 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
                 templateName = "-商业险保单.pdf";
                 break;
             case InsuranceRisk.ACCIDENT_CODE:
-                busNo = insAreaCompany.getAccidentStrInfo();
+                busNo = policyPrintVo.getPolicyNumber();
                 busType = BusType.BT_4;
                 templateName = busNo + "-非车险保单.pdf";
                 break;
@@ -530,10 +530,14 @@ public class YangGuangOrderApiServiceImpl implements YangGuangOrderApiService {
         String jqPath = getPdfUrl(insAreaCompany,insOrders,InsuranceRisk.TRAFFIC_CODE,PolicyPrintVo.PolicyPrintType.PPT_2.getCode(),insAreaCompany.getJqpolicyno(),flag);
         String syPath = getPdfUrl(insAreaCompany,insOrders,InsuranceRisk.BUSINESS_CODE,PolicyPrintVo.PolicyPrintType.PPT_2.getCode(),insAreaCompany.getSypolicyno(),flag);
         String fcPath = "";
-        if (insAreaCompany.getAccidentStrInfo() != null && !insAreaCompany.getAccidentStrInfo().equals("")) {
+        String fcProposalNo = "";
+        if (insAreaCompany.getCrossInsurance() != null && !insAreaCompany.getCrossInsurance().isEmpty()) {
             //获取非车保单号
-            String FcProposalNo = insAreaCompany.getAccidentStrInfo();
-            fcPath = getPdfUrl(insAreaCompany,insOrders,InsuranceRisk.ACCIDENT_CODE,PolicyPrintVo.PolicyPrintType.PPT_2.getCode(), FcProposalNo, flag);
+            for (int i = 0; i < insAreaCompany.getCrossInsurance().size(); i++) {
+                JSONObject item = insAreaCompany.getCrossInsurance().getJSONObject(i);
+                fcProposalNo = item.getString("policyNumber");
+            }
+            fcPath = getPdfUrl(insAreaCompany,insOrders,InsuranceRisk.ACCIDENT_CODE,PolicyPrintVo.PolicyPrintType.PPT_2.getCode(), fcProposalNo, flag);
         }
         InsAreaCompanyExternalPolicy insAreaCompanyExternalPolicy =new InsAreaCompanyExternalPolicy(insAreaCompany.getId(),jqPath,syPath,fcPath,null);
         return new ReadPdfUrlListDto(insAreaCompanyExternalPolicy,insAreaCompany,null);