diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java index 65c2001..d42ea02 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java @@ -46,4 +46,11 @@ public class Constant { public static final String SHENZHENPUBLICKEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfZpjt7MVadQky2TL+RHD+eJhjmWNtqCvKWZByVEajltTgLiQFIn8ESNcL9ZkB5aAidxYP7QjHHFWGMgRprkp0CAwEAAQ=="; public static final String SHENZHENPRIVATEKEY = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAx9mmO3sxVp1CTLZMv5EcP54mGOZY22oK8pZkHJURqOW1OAuJAUifwRI1wv1mQHloCJ3Fg/tCMccVYYyBGmuSnQIDAQABAkBm5loBJl0xC6end/XsbPruhq93AqOd1evtHCJP1TFSlIrWPy95H/fqZVxH65uMcXZpuMlmSkj1G8FgY401BvwBAiEA5aspno8vXg7HNXffqDqv2I+G/liOg81ei7bnjBcNGJECIQDew07gL7Se9mkNyakQvuvj/kD/A3YYleXB5ZmQrze/TQIgd0Tl/jO5k4z1Iu03tvOTMlGG9zsh94yFVuULZhLqeCECIGETm/v2zi+4Em//wb2adhIVax221HBCYq3s8M8sjI7BAiEAg5QCIjWpOWFavCmeR6/hoD/dWpKbP55twOKxZyadTEQ="; + + public static final String SUPPLIER="供应商"; + + public static final String CORE_ENTERPRISES="核心企业"; + + public static final String IMPORT_FACTOR="保理公司"; + } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java index 074faab..516cab3 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuDebtTransferStartController.java @@ -37,9 +37,9 @@ public class StuDebtTransferStartController { @PostMapping("/operate") @AnonymousAccess - @ApiOperation("发起债权转让贴现--操作:下载、上传、读取") + @ApiOperation("操作:下载、上传、读取") public ResultEntity operate(@ApiParam("文件ID") Integer id, - @ApiParam("操作类型") String operateType){ + @ApiParam("操作类型") String operateType){ int result=stuDebtTransferStartService.operate(id,operateType); return new ResultEntity<>(HttpStatus.OK,operateType+"成功"); } @@ -71,8 +71,9 @@ public class StuDebtTransferStartController { @PostMapping("/supplierFileDisplay") @AnonymousAccess @ApiOperation("数字签章确权(供应商/核心企业/保理公司)--文件展示") - public ResultEntity> supplierFileDisplay(@ApiParam("用户ID") String userId){ - List stuDebtTransferDTOList=stuDebtTransferStartService.supplierFileDisplay(userId); + public ResultEntity> supplierFileDisplay(@ApiParam("用户ID") String userId, + @ApiParam("企业类别") String category){ + List stuDebtTransferDTOList=stuDebtTransferStartService.supplierFileDisplay(userId,category); return new ResultEntity<>(HttpStatus.OK,"成功",stuDebtTransferDTOList); } } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java index c448250..f617901 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/StuDebtTransferStartService.java @@ -20,5 +20,5 @@ public interface StuDebtTransferStartService { void debtInvestigationPassed(List stuDebtInvestigationInfo); - List supplierFileDisplay(String userId); + List supplierFileDisplay(String userId,String category); } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java index 92e8e8b..c48ed13 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDebtTransferStartServiceImpl.java @@ -1,5 +1,6 @@ package com.sztzjy.block_finance.service.impl; +import com.sztzjy.block_finance.config.Constant; import com.sztzjy.block_finance.config.exception.handler.ServiceException; import com.sztzjy.block_finance.entity.StuDebtInvestigationInfo; import com.sztzjy.block_finance.entity.StuDebtInvestigationInfoExample; @@ -33,7 +34,7 @@ public class StuDebtTransferStartServiceImpl implements StuDebtTransferStartServ public List debtTransferFileDisplay(String userId) { StuTransactionDocumentsInfoExample stuTransactionDocumentsInfoExample=new StuTransactionDocumentsInfoExample(); - stuTransactionDocumentsInfoExample.createCriteria().andUserIdEqualTo(userId); + stuTransactionDocumentsInfoExample.createCriteria().andUserIdEqualTo(userId).andSupplierDisplayEqualTo(1); List stuTransactionDocumentsInfoList = stuTransactionDocumentsInfoMapper.selectByExample(stuTransactionDocumentsInfoExample); if(stuTransactionDocumentsInfoList.isEmpty()){ @@ -49,7 +50,9 @@ public class StuDebtTransferStartServiceImpl implements StuDebtTransferStartServ stuTransactionDocumentsInfo.setId(uuid); stuTransactionDocumentsInfo.setUserId(userId); stuTransactionDocumentsInfoMapper.insert(stuTransactionDocumentsInfo); - stuTransactionDocumentsInfoList.add(stuTransactionDocumentsInfo); + if(stuTransactionDocumentsInfo.getDiscountDisplay()==1){ + stuTransactionDocumentsInfoList.add(stuTransactionDocumentsInfo); + } } } List stuDebtTransferDTOList = convertUtil.entityToDTOList(stuTransactionDocumentsInfoList, StuDebtTransferDTO.class); @@ -114,10 +117,54 @@ public class StuDebtTransferStartServiceImpl implements StuDebtTransferStartServ } @Override - public List supplierFileDisplay(String userId) { - StuTransactionDocumentsInfoExample example=new StuTransactionDocumentsInfoExample(); - example.createCriteria().andUserIdEqualTo(userId).andSupplierDisplayEqualTo(1); - List stuTransactionDocumentsInfoList = stuTransactionDocumentsInfoMapper.selectByExample(example); + public List supplierFileDisplay(String userId,String category) { + StuTransactionDocumentsInfoExample stuTransactionDocumentsInfoExample=new StuTransactionDocumentsInfoExample(); + StuTransactionDocumentsInfoExample.Criteria criteria=stuTransactionDocumentsInfoExample.createCriteria(); + criteria.andUserIdEqualTo(userId); + if(category.equals(Constant.SUPPLIER)){ + criteria.andSupplierDisplayEqualTo(1); + } + if(category.equals(Constant.CORE_ENTERPRISES)){ + criteria.andCoreEnterpriseDisplayEqualTo(1); + } + if(category.equals(Constant.IMPORT_FACTOR)){ + criteria.andFactoringCompanyDisplayEqualTo(1); + } + List stuTransactionDocumentsInfoList = stuTransactionDocumentsInfoMapper.selectByExample(stuTransactionDocumentsInfoExample); + + if(stuTransactionDocumentsInfoList.isEmpty()){ + //查询默认数据 + StuTransactionDocumentsInfoExample example = new StuTransactionDocumentsInfoExample(); + example.createCriteria().andUserIdIsNull(); + List stuTransactionDocumentsInfos = stuTransactionDocumentsInfoMapper.selectByExample(example); + + for (int i = 0; i < stuTransactionDocumentsInfos.size(); i++) { + StuTransactionDocumentsInfo stuTransactionDocumentsInfo = stuTransactionDocumentsInfos.get(i); + Integer uuid = UUID.randomUUID().toString().replaceAll("-", "").hashCode(); + uuid = uuid < 0 ? -uuid : uuid;//String.hashCode() 值会为空 + stuTransactionDocumentsInfo.setId(uuid); + stuTransactionDocumentsInfo.setUserId(userId); + stuTransactionDocumentsInfoMapper.insert(stuTransactionDocumentsInfo); + if(category.equals(Constant.SUPPLIER)){ //查询供应商文件信息 + if(stuTransactionDocumentsInfo.getSupplierDisplay()==1){ + stuTransactionDocumentsInfoList.add(stuTransactionDocumentsInfo); + } + } + + if(category.equals(Constant.SUPPLIER)){ //查询核心企业文件信息 + if(stuTransactionDocumentsInfo.getCoreEnterpriseDisplay()==1){ + stuTransactionDocumentsInfoList.add(stuTransactionDocumentsInfo); + } + } + + if(category.equals(Constant.SUPPLIER)){ //查询保理公司文件信息 + if(stuTransactionDocumentsInfo.getFactoringCompanyDisplay()==1){ + stuTransactionDocumentsInfoList.add(stuTransactionDocumentsInfo); + } + } + } + } + List stuDebtTransferDTOList = convertUtil.entityToDTOList(stuTransactionDocumentsInfoList, StuDebtTransferDTO.class); return stuDebtTransferDTOList; }