3 次代碼提交 1f7bd10066 ... 5aa0e724dc

作者 SHA1 備註 提交日期
  liutao 5aa0e724dc Merge remote-tracking branch 'origin/smb' into smb 16 小時之前
  liutao c587998a6f fix(苏商银行):续授信逻辑修改 16 小時之前
  liutao 604ce02cec fix(苏商银行):字典类 17 小時之前

+ 42 - 0
src/main/java/com/sunxung/factoring/entity/smb/FinancingFromInvestorsNotice.java

@@ -138,6 +138,48 @@ public class FinancingFromInvestorsNotice extends BaseEntity {
     @TableField(exist = false)
     private FileStorage file327;
 
+    /**
+     * 还款账号
+     */
+    @TableField(exist = false)
+    private String repaymentAccount;
+
+    /**
+     * 还款账户名
+     */
+    @TableField(exist = false)
+    private String repaymentAccountName;
+
+    /**
+     * 还款账户账号类型
+     */
+    @TableField(exist = false)
+    private String repaymentAccountType;
+
+    public String getRepaymentAccount() {
+        return repaymentAccount;
+    }
+
+    public void setRepaymentAccount(String repaymentAccount) {
+        this.repaymentAccount = repaymentAccount;
+    }
+
+    public String getRepaymentAccountName() {
+        return repaymentAccountName;
+    }
+
+    public void setRepaymentAccountName(String repaymentAccountName) {
+        this.repaymentAccountName = repaymentAccountName;
+    }
+
+    public String getRepaymentAccountType() {
+        return repaymentAccountType;
+    }
+
+    public void setRepaymentAccountType(String repaymentAccountType) {
+        this.repaymentAccountType = repaymentAccountType;
+    }
+
     public FileStorage getFile301() {
         return file301;
     }

+ 6 - 0
src/main/java/com/sunxung/factoring/service/project/impl/BusinessProcessingTaskServiceImpl.java

@@ -171,6 +171,8 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
     @Autowired
     private RepositoryService repositoryService;
     @Autowired
+    private IFinancingFromInvestorsService financingFromInvestorsService;
+    @Autowired
     private IFinancingFromInvestorsHistoryService financingFromInvestorsHistoryService;
     @Autowired
     private IFinancingFromInvestorsNoticeService financingFromInvestorsNoticeService;
@@ -1050,6 +1052,7 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
             List<FinancingFromInvestorsHistory> financingFromInvestorsHistories = financingFromInvestorsHistoryService.lambdaQuery().eq(FinancingFromInvestorsHistory::getFinancingFromInvestorsId, businessKey).list();
             if(CollectionUtil.isNotEmpty(financingFromInvestorsHistories)){
                 for (FinancingFromInvestorsHistory financingFromInvestorsHistory : financingFromInvestorsHistories) {
+                    FinancingFromInvestors financingFromInvestors = financingFromInvestorsService.getById(financingFromInvestorsHistory.getFinancingFromInvestorsId());
                     FileStorageDO storageDO = fileService.findOneByBusinessId(financingFromInvestorsHistory.getId(), FileModuleDict.ChildEnum.SMB_BUSINESS_LICENSE_FILE_HISTORY.getCode());
                     financingFromInvestorsHistory.setFileStorageDO(storageDO);
                     SupplierInfo supplierInfo = supplierInfoService.get(financingFromInvestorsHistory.getSupplierInfoId());
@@ -1138,6 +1141,9 @@ public class BusinessProcessingTaskServiceImpl implements BusinessProcessingTask
                     Dictionary limit = dictService.getByCode(financingFromInvestorsNotice.getLimitStatus());
                     financingFromInvestorsNotice.setApplyStatus(apply.getName());
                     financingFromInvestorsNotice.setLimitStatus(limit.getName());
+                    financingFromInvestorsNotice.setRepaymentAccount(financingFromInvestors.getRepaymentAccount());
+                    financingFromInvestorsNotice.setRepaymentAccountType(financingFromInvestors.getRepaymentAccountType());
+                    financingFromInvestorsNotice.setRepaymentAccountName(financingFromInvestors.getRepaymentAccountName());
                     BusinessHistoricDetailVo back = new BusinessHistoricDetailVo();
                     back.setFormBusinessName("苏商银行回调");
                     BusinessProcessingLogVo businessProcessingLogBack = new BusinessProcessingLogVo();

+ 4 - 0
src/main/java/com/sunxung/factoring/service/smb/impl/FinancingFromInvestorsServiceImpl.java

@@ -163,6 +163,10 @@ public class FinancingFromInvestorsServiceImpl extends ServiceImpl<FinancingFrom
                 throw new BusinessException(CodeUtil.FAIL, "未到可再次申请日期,无法续授信!");
             }
             financingFromInvestors.setId(null);
+            financingFromInvestors.setCreditStatus(null);
+            financingFromInvestors.setRepaymentAccount(null);
+            financingFromInvestors.setRepaymentAccountName(null);
+            financingFromInvestors.setRepaymentAccountType(null);
         }
         List<SMBFileUpload> fileList = new ArrayList<>();
         List<Long> registeredAddressCodeList = financingFromInvestors.getRegisteredAddressCodeList();