|
@@ -9,6 +9,7 @@ import com.sunxung.factoring.entity.financing.contract.ContractElectronicCustome
|
|
import com.sunxung.factoring.entity.financing.contract.ContractElectronicInfo;
|
|
import com.sunxung.factoring.entity.financing.contract.ContractElectronicInfo;
|
|
import com.sunxung.factoring.entity.smb.*;
|
|
import com.sunxung.factoring.entity.smb.*;
|
|
import com.sunxung.factoring.entity.sys.FileStorage;
|
|
import com.sunxung.factoring.entity.sys.FileStorage;
|
|
|
|
+import com.sunxung.factoring.entity.sys.FileStorageDO;
|
|
import com.sunxung.factoring.mapper.smb.SmbContractInfoMapper;
|
|
import com.sunxung.factoring.mapper.smb.SmbContractInfoMapper;
|
|
import com.sunxung.factoring.service.financing.contract.IContractElectronicCustomerInfoService;
|
|
import com.sunxung.factoring.service.financing.contract.IContractElectronicCustomerInfoService;
|
|
import com.sunxung.factoring.service.financing.contract.IContractElectronicInfoService;
|
|
import com.sunxung.factoring.service.financing.contract.IContractElectronicInfoService;
|
|
@@ -17,6 +18,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.sunxung.factoring.service.smbApi.api.SMBApiService;
|
|
import com.sunxung.factoring.service.smbApi.api.SMBApiService;
|
|
import com.sunxung.factoring.service.smbApi.dto.ContractSignBizJsonDto;
|
|
import com.sunxung.factoring.service.smbApi.dto.ContractSignBizJsonDto;
|
|
import com.sunxung.factoring.service.smbApi.resp.ContractSignResp;
|
|
import com.sunxung.factoring.service.smbApi.resp.ContractSignResp;
|
|
|
|
+import com.sunxung.factoring.service.sys.FileService;
|
|
import com.sunxung.factoring.service.sys.FileStorageService;
|
|
import com.sunxung.factoring.service.sys.FileStorageService;
|
|
import org.apache.xpath.operations.Bool;
|
|
import org.apache.xpath.operations.Bool;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -62,7 +64,7 @@ public class SmbContractInfoServiceImpl extends ServiceImpl<SmbContractInfoMappe
|
|
private IFinancingFromInvestorsPersonService financingFromInvestorsPersonService;
|
|
private IFinancingFromInvestorsPersonService financingFromInvestorsPersonService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
- private FileStorageService fileStorageService;
|
|
|
|
|
|
+ private FileService fileService;
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private ISmbContractInfoService smbContractInfoService;
|
|
private ISmbContractInfoService smbContractInfoService;
|
|
@@ -84,23 +86,27 @@ public class SmbContractInfoServiceImpl extends ServiceImpl<SmbContractInfoMappe
|
|
ContractElectronicInfo contractElectronicInfoMaster = contractElectronicInfoService.getById(smbMasterContractInfo.getContractElectronicInfoId());
|
|
ContractElectronicInfo contractElectronicInfoMaster = contractElectronicInfoService.getById(smbMasterContractInfo.getContractElectronicInfoId());
|
|
List<ContractElectronicCustomerInfo> contractElectronicCustomerInfosMaster = contractElectronicCustomerInfoService.lambdaQuery().eq(ContractElectronicCustomerInfo::getContractElectronicInfoId, contractElectronicInfoMaster.getId()).list();
|
|
List<ContractElectronicCustomerInfo> contractElectronicCustomerInfosMaster = contractElectronicCustomerInfoService.lambdaQuery().eq(ContractElectronicCustomerInfo::getContractElectronicInfoId, contractElectronicInfoMaster.getId()).list();
|
|
ContractElectronicCustomerInfo contractElectronicCustomerInfoMaster = contractElectronicCustomerInfosMaster.get(0);
|
|
ContractElectronicCustomerInfo contractElectronicCustomerInfoMaster = contractElectronicCustomerInfosMaster.get(0);
|
|
- FileStorage fileStorageMaster = fileStorageService.get(contractElectronicCustomerInfoMaster.getFileId());
|
|
|
|
|
|
+ FileStorageDO fileStorageDO = fileService.getById(contractElectronicCustomerInfoMaster.getFileId());
|
|
|
|
+ fileStorageDO.setBusinessId(contractElectronicCustomerInfoMaster.getId());
|
|
|
|
+ fileService.updateById(fileStorageDO);
|
|
List<SMBFileUpload> fileList = new ArrayList<>();
|
|
List<SMBFileUpload> fileList = new ArrayList<>();
|
|
SMBFileUpload smbFileUpload = new SMBFileUpload();
|
|
SMBFileUpload smbFileUpload = new SMBFileUpload();
|
|
- smbFileUpload.setFilePath(fileStorageMaster.getAbsolutePath());
|
|
|
|
- smbFileUpload.setFileType(fileStorageMaster.getFileType());
|
|
|
|
- smbFileUpload.setFileName(fileStorageMaster.getOriginalName());
|
|
|
|
|
|
+ smbFileUpload.setFilePath(fileStorageDO.getAbsolutePath());
|
|
|
|
+ smbFileUpload.setFileType(fileStorageDO.getFileType());
|
|
|
|
+ smbFileUpload.setFileName(fileStorageDO.getOriginalName());
|
|
fileList.add(smbFileUpload);
|
|
fileList.add(smbFileUpload);
|
|
//担保合同
|
|
//担保合同
|
|
SmbContractInfo smbGuaContractContractInfo = this.getById(smbguaContractContractInfoId);
|
|
SmbContractInfo smbGuaContractContractInfo = this.getById(smbguaContractContractInfoId);
|
|
ContractElectronicInfo contractElectronicInfoGuaContract = contractElectronicInfoService.getById(smbGuaContractContractInfo.getContractElectronicInfoId());
|
|
ContractElectronicInfo contractElectronicInfoGuaContract = contractElectronicInfoService.getById(smbGuaContractContractInfo.getContractElectronicInfoId());
|
|
List<ContractElectronicCustomerInfo> contractElectronicCustomerInfosGuaContract = contractElectronicCustomerInfoService.lambdaQuery().eq(ContractElectronicCustomerInfo::getContractElectronicInfoId, contractElectronicInfoGuaContract.getId()).list();
|
|
List<ContractElectronicCustomerInfo> contractElectronicCustomerInfosGuaContract = contractElectronicCustomerInfoService.lambdaQuery().eq(ContractElectronicCustomerInfo::getContractElectronicInfoId, contractElectronicInfoGuaContract.getId()).list();
|
|
ContractElectronicCustomerInfo contractElectronicCustomerInfoGuaContract = contractElectronicCustomerInfosGuaContract.get(0);
|
|
ContractElectronicCustomerInfo contractElectronicCustomerInfoGuaContract = contractElectronicCustomerInfosGuaContract.get(0);
|
|
- FileStorage fileStorageGuaContract = fileStorageService.get(contractElectronicCustomerInfoGuaContract.getFileId());
|
|
|
|
|
|
+ FileStorageDO storageDO = fileService.getById(contractElectronicCustomerInfoGuaContract.getFileId());
|
|
|
|
+ storageDO.setBusinessId(contractElectronicCustomerInfoGuaContract.getId());
|
|
|
|
+ fileService.updateById(storageDO);
|
|
SMBFileUpload smbFileUploadGua = new SMBFileUpload();
|
|
SMBFileUpload smbFileUploadGua = new SMBFileUpload();
|
|
- smbFileUploadGua.setFilePath(fileStorageGuaContract.getAbsolutePath());
|
|
|
|
- smbFileUploadGua.setFileType(fileStorageGuaContract.getFileType());
|
|
|
|
- smbFileUploadGua.setFileName(fileStorageGuaContract.getOriginalName());
|
|
|
|
|
|
+ smbFileUploadGua.setFilePath(storageDO.getAbsolutePath());
|
|
|
|
+ smbFileUploadGua.setFileType(storageDO.getFileType());
|
|
|
|
+ smbFileUploadGua.setFileName(storageDO.getOriginalName());
|
|
fileList.add(smbFileUploadGua);
|
|
fileList.add(smbFileUploadGua);
|
|
String smbMasterFileId;
|
|
String smbMasterFileId;
|
|
String smbGuaFileId;
|
|
String smbGuaFileId;
|