Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/inkasso/factoring/common/util/ElectronicSignatureUtil.java

@@ -24,7 +24,7 @@ public class ElectronicSignatureUtil {
 
     private static HttpClientUtil INSTANCE = HttpClientUtil.getInstance();
 
-    private static final String SOURCE = "factoringTrade";
+    private static final String SOURCE = "factoringTradeOnline";
 
     private static final String PREFIX = "trade";
 

src/main/java/com/inkasso/factoring/creditmanagement/entity/CreditConclusion.java

@@ -32,6 +32,16 @@ public class CreditConclusion {
      */
     @TableField("content")
     private String content;
+    @TableField(exist = false)
+    private String fx;
+
+    public String getFx() {
+        return fx;
+    }
+
+    public void setFx(String fx) {
+        this.fx = fx;
+    }
 
     public Long getId() {
         return id;

src/main/java/com/inkasso/factoring/creditmanagement/service/impl/ProjectInformationServiceImpl.java

@@ -449,6 +449,29 @@ public class ProjectInformationServiceImpl extends ServiceImpl<ProjectInformatio
         CreditResolution creditResolution = creditResolutionService.lambdaQuery().eq(CreditResolution::getcProjectInformationId, projectInformation.getId()).one();
         if(creditResolution != null){
             List<CreditConclusion> creditConclusions = creditConclusionService.lambdaQuery().eq(CreditConclusion::getCreditResolutionId, creditResolution.getId()).list();
+            for (CreditConclusion creditConclusion : creditConclusions) {
+                if(creditConclusion.getContent().startsWith("给予卖方")){
+                    creditConclusion.setFx("/给予卖方(.*?)授信金额(.*?)元人民币/g");
+                }
+                if(creditConclusion.getContent().startsWith("授信期限自")){
+                    creditConclusion.setFx("/授信期限自(.+)/");
+                }
+                if(creditConclusion.getContent().startsWith("本次合作的买方为")){
+                    creditConclusion.setFx("/本次合作的买方为(.*?)，项目为(.+)/");
+                }
+                if(creditConclusion.getContent().startsWith("利息和管理费")){
+                    creditConclusion.setFx("/利息和管理费由卖方支付，支付方式为([\\s\\S]*)/");
+                }
+                if(creditConclusion.getContent().startsWith("上游账期为")){
+                    creditConclusion.setFx("/上游账期为(.+?)，保理融资期限为(.+?)账期/");
+                }
+                if(creditConclusion.getContent().startsWith("上报卖方")){
+                    creditConclusion.setFx("/上报卖方([\\s\\S]+?)征信/g");
+                }
+                if(creditConclusion.getContent().startsWith("卖方法定代表人") || creditConclusion.getContent().startsWith("提供个人连带责任担保") || creditConclusion.getContent().startsWith("提供连带责任担保") ){
+                    creditConclusion.setFx("/卖方法定代表人([\\s\\S]*?)提供个人连带责任担保，上报([\\s\\S]*?)征信/g");
+                }
+            }
             projectInformation.setCreditConclusions(creditConclusions);
         }
         return projectInformation;

src/main/java/com/inkasso/factoring/creditmanagement/service/impl/SupplierInfoServiceImpl.java

@@ -565,6 +565,9 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
         //保存供应商信息
         Enterprise enterprise = supplierInfo.getEnterprise();
         Boolean flag = updateEnterprise(enterprise, supplierInfo);
+        if(flag){
+            supplierInfo.setStatus(SupplierStatusEnums.VOTE.getCode());
+        }
         Enterprise existEnterprise = enterpriseService.getById(enterprise.getId());
         //保存担保企业信息
         Enterprise guaranteeEnterprise = supplierInfo.getGuaranteeEnterprise();
@@ -700,18 +703,20 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
             }
             // B端开启流程
             SupplierInfo exist = getById(supplierInfo.getId());
-            exist.setHistoryId(history);
-            Enterprise existsEnterprise = enterpriseService.getById(exist.getcEnterpriseId());
-            exist.setEnterprise(existsEnterprise);
-            ResponseJson responseJson;
-            try {
-                responseJson = restTemplate.postForObject(supplierStartProcess, exist, ResponseJson.class);
-            } catch (Exception e) {
-                throw new ServiceException(CodeUtil.FAIL, "网络异常，请稍后重试！");
+            if(supplierInfo.getStatus().equals(SupplierStatusEnums.DUE_DILIGENCE_ALLOCATION.getCode())){
+                exist.setHistoryId(history);
+                Enterprise existsEnterprise = enterpriseService.getById(exist.getcEnterpriseId());
+                exist.setEnterprise(existsEnterprise);
+                ResponseJson responseJson;
+                try {
+                    responseJson = restTemplate.postForObject(supplierStartProcess, exist, ResponseJson.class);
+                } catch (Exception e) {
+                    throw new ServiceException(CodeUtil.FAIL, "网络异常，请稍后重试！");
+                }
+                String status = (String) responseJson.getData();
+                exist.setStatus(status);
+                updateById(exist);
             }
-            String status = (String) responseJson.getData();
-            exist.setStatus(status);
-            updateById(exist);
             return exist;
         }
         return supplierInfo;
@@ -914,13 +919,18 @@ public class SupplierInfoServiceImpl extends ServiceImpl<SupplierInfoMapper, Sup
 
     private Boolean updateEnterprise(Enterprise enterprise, SupplierInfo supplierInfo) {
         Enterprise exists = enterpriseService.getById(enterprise.getId());
+        Boolean flag = false;
         if (supplierInfo.getVisible()) {
+            String businessAddress = enterprise.getBusinessAddress();
+            if (businessAddress.contains("黑龙江") || businessAddress.contains("辽宁") || businessAddress.contains("吉林")) {
+                supplierInfo.setSupplierErrors("经营地址红否");
+                flag = true;
+            }
             if (!exists.getAuthStatus() || exists.getCertificateSignStatus() != 1) {
                 throw new BusinessException(CodeUtil.FAIL, "请先完成认证和授权书的签署！");
             }
         }
         Enterprise existsEnterprise = enterpriseService.getById(enterprise.getId());
-        Boolean flag = false;
         List files = new ArrayList<>();
         //保存文件
         fileService.lambdaUpdate().eq(FileStorageDO::getBusinessId, enterprise.getId()).eq(FileStorageDO::getBusinessType, FileTypeEnum.ENTERPRISE_LOCATION_MAP.getCode()).set(FileStorageDO::getBusinessId, null).update();

src/main/java/com/inkasso/factoring/settlement/entity/SettlementBasicInfo.java

@@ -2,13 +2,12 @@ package com.inkasso.factoring.settlement.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.inkasso.factoring.acceptanceManagement.entity.CAcceptanceGoodsInfo;
 import com.inkasso.factoring.common.entity.BaseEntity;
 import com.inkasso.factoring.dict.entity.Dictionary;
 import com.inkasso.factoring.file.entity.FileStorageDO;
 import com.inkasso.factoring.invoicemanage.entity.InvoiceGoodsInfo;
-import javafx.application.Platform;
+import com.inkasso.factoring.tradingPlatform.entity.Platform;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
@@ -78,7 +77,7 @@ public class SettlementBasicInfo extends BaseEntity {
      * 对账结束时间
      */
     @NotNull(message = "对账结束时间不能为空")
-    @DateTimeFormat(pattern = "yyyy-MM-dd" )
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField("settlement_end_date")
     private Date settlementEndDate;
 
@@ -239,7 +238,9 @@ public class SettlementBasicInfo extends BaseEntity {
     @TableField(exist = false)
     private List<Long> addFileIds;
 
-    /** 是否提交 true是 false否 **/
+    /**
+     * 是否提交 true是 false否
+     **/
     @TableField(exist = false)
     private Boolean submit;
 
@@ -578,9 +579,11 @@ public class SettlementBasicInfo extends BaseEntity {
     public void setStatusName(String statusName) {
         this.statusName = statusName;
     }
+
     public String getAcceptanceNumber() {
         return acceptanceNumber;
     }
+
     public void setAcceptanceNumber(String acceptanceNumber) {
         this.acceptanceNumber = acceptanceNumber;
     }

src/main/resources/application-dev.yml

@@ -7,7 +7,7 @@ upload:
 datasource:
   master:
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://192.168.3.6:3106/factoring_trade_v4?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
+    url: jdbc:mysql://192.168.3.6:3106/factoring_trade_v4_online_new?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&rewriteBatchedStatements=true
     username: root
     password: root
     driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/application-prod.yml

@@ -112,41 +112,41 @@ codegeneration:
   filePath:  D:/codegeneration
 
 fdd:
-  contractUrl: "http://192.168.125.194:8888/#/register"
-  caykCustomId: "8210513B14FE854DF1061E2D54665AF9"
-  yhrzzpCustomId: "2291B7F84D6340530A5469FB6FC15BF3"
-  registerUrl: "http://222.90.211.174:18870/fdd/accountRegister"
-  authUrl: "http://222.90.211.174:18870/fdd/getAuthAddress/sop"
-  removeAuthInfoUrl: "http://222.90.211.174:18870/fdd/removeAuthInfoUrl"
-  authUrlV3: "http://222.90.211.174:18870/fdd/v3/getAuthAddress"
-  authUrlV3PersonalFaceRecognition: "http://222.90.211.174:18870/fdd/v3/getAuthAddress/face/recognition"
-  uploadContractUrl: "http://222.90.211.174:18870/fdd/uploadContract"
-  batchSignUrl: "http://222.90.211.174:18870/fdd/manualBatchSign"
-  batchSignUrlSearchLocation: "http://222.90.211.174:18870/fdd/manualBatchSign/searchLocation"
-  authSignUrl: "http://222.90.211.174:18870/fdd/autoSign"
-  downloadContractUrl: "http://222.90.211.174:18870/fdd/downloadContract"
-  filedContractUrl: "http://222.90.211.174:18870/fdd/contractFiled"
-  beforeAutoSignUrl: "http://222.90.211.174:18870/fdd/before_autoSign"
-  shortUrl: "http://222.90.211.174:18870/fdd/short_url"
-  reportUrl: "http://222.90.211.174:18870/fdd/compliance_contract_report"
-  authInfoUrl: "http://222.90.211.174:18870/fdd/getAuthInfo"
-  getAuthInfoDetail: "http://222.90.211.174:18870/fdd/getAuthInfoDetail"
-  signInfoUrl: "http://222.90.211.174:18870/fdd/getSignInfo"
-  viewContractUrl: "http://222.90.211.174:18870/fdd/getViewContractUrl"
+  contractUrl: "https://hdts.changan-inkasso.com/#/register"
+  caykCustomId: "49AE3DAA91DA87A92C9371CE41D2A642"
+  yhrzzpCustomId: "E5E5D7FD1424DE57C4672B566BF517E2"
+  registerUrl: "http://47.114.148.98:8868/fdd/accountRegister"
+  authUrl: "http://47.114.148.98:8868/fdd/getAuthAddress/sop"
+  removeAuthInfoUrl: "http://47.114.148.98:8868/fdd/removeAuthInfoUrl"
+  authUrlV3: "http://47.114.148.98:8868/fdd/v3/getAuthAddress"
+  authUrlV3PersonalFaceRecognition: "http://47.114.148.98:8868/fdd/v3/getAuthAddress/face/recognition"
+  uploadContractUrl: "http://47.114.148.98:8868/fdd/uploadContract"
+  batchSignUrl: "http://47.114.148.98:8868/fdd/manualBatchSign"
+  batchSignUrlSearchLocation: "http://47.114.148.98:8868/fdd/manualBatchSign/searchLocation"
+  authSignUrl: "http://47.114.148.98:8868/fdd/autoSign"
+  downloadContractUrl: "http://47.114.148.98:8868/fdd/downloadContract"
+  filedContractUrl: "http://47.114.148.98:8868/fdd/contractFiled"
+  beforeAutoSignUrl: "http://47.114.148.98:8868/fdd/before_autoSign"
+  shortUrl: "http://47.114.148.98:8868/fdd/short_url"
+  reportUrl: "http://47.114.148.98:8868/fdd/compliance_contract_report"
+  authInfoUrl: "http://47.114.148.98:8868/fdd/getAuthInfo"
+  getAuthInfoDetail: "http://47.114.148.98:8868/fdd/getAuthInfoDetail"
+  signInfoUrl: "http://47.114.148.98:8868/fdd/getSignInfo"
+  viewContractUrl: "http://47.114.148.98:8868/fdd/getViewContractUrl"
 
 sop:
-  getBusinessByKeyWordUrl: http://222.90.211.174:18868/api/trade/findBusinessName
-  comprehensiveRiskInvestigationUrl: http://222.90.211.174:18868/api/trade/comprehensiveRiskInvestigation
-  judgmentDocumentsUrl: http://222.90.211.174:18868/api/trade/judgmentDocuments
-  dongjiangaoRisksUrl: http://222.90.211.174:18868/api/trade/dongjiangaoRisk
-  pubStockUrl: http://222.90.211.174:18868/api/trade/pubStock
-  addBusinessUrl: http://222.90.211.174:18868/api/trade/addBusiness
-  sixSearchUrl: http://222.90.211.174:18868/api/trade/sixSearch
-  twoSearchUrl: http://222.90.211.174:18868/api/trade/twoSearch
-  getChangesUrl: http://222.90.211.174:18868/api/trade/getChanges
-  getBusinesssScoreUrl: http://222.90.211.174:18868/api/trade/getBusinesssScore
-  synchronizeInformation: http://222.90.211.174:18868/sys/customer/synchronize/information
-  getEnterpriseAreaUrl: http://222.90.211.174:18868/api/trade/getEnterpriseArea
+  getBusinessByKeyWordUrl: http://222.90.211.174:10526/api/trade/findBusinessName
+  comprehensiveRiskInvestigationUrl: http://222.90.211.174:10526/api/trade/comprehensiveRiskInvestigation
+  judgmentDocumentsUrl: http://222.90.211.174:10526/api/trade/judgmentDocuments
+  dongjiangaoRisksUrl: http://222.90.211.174:10526/api/trade/dongjiangaoRisk
+  pubStockUrl: http://222.90.211.174:10526/api/trade/pubStock
+  addBusinessUrl: http://222.90.211.174:10526/api/trade/addBusiness
+  sixSearchUrl: http://222.90.211.174:10526/api/trade/sixSearch
+  twoSearchUrl: http://222.90.211.174:10526/api/trade/twoSearch
+  getChangesUrl: http://222.90.211.174:10526/api/trade/getChanges
+  getBusinesssScoreUrl: http://222.90.211.174:10526/api/trade/getBusinesssScore
+  synchronizeInformation: http://222.90.211.174:10526/sys/customer/synchronize/information
+  getEnterpriseAreaUrl: http://222.90.211.174:10526/api/trade/getEnterpriseArea
 
 trade:
   biddingManagementStartProcessUrl: http://citp.changan-inkasso.com/tradeV4-backend/api/biddingManagement/startProcess