build.gradle

@@ -9,7 +9,7 @@ targetCompatibility = 1.8
 
 jar {
     baseName = 'factoring-trade-prod'
-    version = '1.0.67'
+    version = '1.0.68'
 }
 
 springBoot {

src/main/java/com/sunxung/factoring/entity/sys/FileStorage.java

@@ -37,6 +37,8 @@ public class FileStorage extends BaseEntity {
     private String absolutePath;
     private long size;
 
+    private String type;
+
     public FileStorage() {
     }
 
@@ -215,6 +217,14 @@ public class FileStorage extends BaseEntity {
         this.size = size;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     /**
      * 文件附属对象
      */

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractLegalFinalApprovalServiceImpl.java

@@ -160,7 +160,7 @@ public class ContractLegalFinalApprovalServiceImpl extends ServiceImpl<ContractL
                 accountInfoQuery.setAcctType("5");
                 List<AccountInfoQueryResp> accountInfoQueryResps = smbApiService.accountInfoQuery(accountInfoQuery, financingFromInvestors.getOpenId());
                 if(CollectionUtil.isEmpty(accountInfoQueryResps)){
-                    throw new BusinessException(CodeUtil.FAIL,"为查询到账户信息");
+                    throw new BusinessException(CodeUtil.FAIL,"未查询到账户信息");
                 }
                 AccountInfoQueryResp accountInfoQueryResp = accountInfoQueryResps.get(0);
 

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractMakingServiceImpl.java

@@ -1009,7 +1009,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
         List<SmbContractInfo> smbContractInfos = new ArrayList<>();
         ContractInfo contractInfo = contractInfoService.getById(contractInfoId);
         ReviewFinancingInfo reviewFinancingInfo = reviewFinancingInfoService.lambdaQuery().eq(ReviewFinancingInfo::getReviewQuotaDisburseId, contractInfo.getReviewQuotaDisburseId()).one();
-        if (ConstantUtil.JIANGSU_SUSHANG_BANK.equals(reviewFinancingInfo.getInstitutionName())) {
+        if (reviewFinancingInfo != null && ConstantUtil.JIANGSU_SUSHANG_BANK.equals(reviewFinancingInfo.getInstitutionName())) {
             ReviewQuotaDisburse reviewQuotaDisburse = reviewQuotaDisburseService.getById(reviewFinancingInfo.getReviewQuotaDisburseId());
             CFinancingBasicInfo cFinancingBasicInfo = financingBasicInfoService.getById(reviewQuotaDisburse.getFinancingBasicInfoId());
             SupplierInfo supplierInfo = supplierInfoService.getByEnterpriseId(cFinancingBasicInfo.getMainEnterpriseId());

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractSignConfirmServiceImpl.java

@@ -163,7 +163,7 @@ public class ContractSignConfirmServiceImpl extends ServiceImpl<ContractSignConf
             //修改融资申请当前阶段
             financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.CONTRACT_MAKING.getCode());
             financingBasicInfoService.updateById(financingBasicInfo);
-        } else if (ConstantConversionUtil.APPROVAL_RESULT_VETO.equals(contractInfo.getConclusion())) {
+        } else if (ConstantConversionUtil.APPROVAL_RESULT_VETO.equals(contractSignConfirm.getConclusion())) {
             //修改融资申请当前阶段和状态
             financingBasicInfo.setFinancingStatus(ProjectInitiationStatusDict.ChildEnum.TERMINATED.getCode());
             financingBasicInfo.setCurrentStage("");

src/main/java/com/sunxung/factoring/service/financing/payment/impl/PaymentApplyServiceImpl.java

@@ -570,7 +570,7 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
                                 fileStorage.setPath(fileStorageDO.getPath());
                                 fileStorage.setId(fileStorageDO.getId());
                                 fileStorage.setOriginalName(fileStorageDO.getOriginalName());
-                                fileStorage.setFileType(fileStorageDO.getType());
+                                fileStorage.setType(fileStorageDO.getType());
                                 acceptanceFiles.add(fileStorage);
                             });
                         }
@@ -636,6 +636,7 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
                     fileStorage.setPath(fileStorageDO.getPath());
                     fileStorage.setId(fileStorageDO.getId());
                     fileStorage.setOriginalName(fileStorageDO.getOriginalName());
+                    fileStorage.setType(fileStorageDO.getType());
                     salesContractFileList.add(fileStorage);
                 });
             }

src/main/java/com/sunxung/factoring/service/financing/payment/impl/PaymentApprovalServiceImpl.java

@@ -217,6 +217,7 @@ public class PaymentApprovalServiceImpl extends ServiceImpl<PaymentApprovalMappe
                     fileStorage.setPath(fileStorageDO.getPath());
                     fileStorage.setId(fileStorageDO.getId());
                     fileStorage.setOriginalName(fileStorageDO.getOriginalName());
+                    fileStorage.setType(fileStorageDO.getType());
                     salesContractFileList.add(fileStorage);
                 });
             }
@@ -278,7 +279,7 @@ public class PaymentApprovalServiceImpl extends ServiceImpl<PaymentApprovalMappe
                                 fileStorage.setPath(fileStorageDO.getPath());
                                 fileStorage.setId(fileStorageDO.getId());
                                 fileStorage.setOriginalName(fileStorageDO.getOriginalName());
-                                fileStorage.setFileType(fileStorageDO.getType());
+                                fileStorage.setType(fileStorageDO.getType());
                                 acceptanceFiles.add(fileStorage);
                             });
                         }

src/main/resources/application-dev.yml

@@ -239,6 +239,6 @@ smb:
   product-code: 200016
   sys-code: V2CV62Lw
   platform-code: EOLBIMS
-  cert-file-path: E:/project/smb_ssl/
+  cert-file-path: /Users/l.jia/smb_ssl/
   sftp-path: D:/freeFTPd/sftproot/smb_test/trade
   file-url: https://fsoftssit.smb956101.com:2443/fsoftssit1/