Merge branch 'smb'

src/main/java/com/sunxung/factoring/service/creditresolution/impl/CreditResolutionApprovalServiceImpl.java

@@ -125,6 +125,7 @@ public class CreditResolutionApprovalServiceImpl extends ServiceImpl<CreditResol
         User projectManager = userService.get(userDO.getProjectManager());
         User riskManager = userService.get(userDO.getRiskManager());
         requestParams.put("businessNo",projectInformation.getBusinessNumber());
+        requestParams.put("implementingFactoringProducts",creditResolution.getImplementingFactoringProducts());
         requestParams.put("manager",projectManager.getName());
         requestParams.put("currency","CNY");
         requestParams.put("transCode","sop.resolution.report");
@@ -266,6 +267,7 @@ public class CreditResolutionApprovalServiceImpl extends ServiceImpl<CreditResol
             UserDO userDO = cUserService.getById(supplierInfo.getSysUserId());
             User projectManager = userService.get(userDO.getProjectManager());
             User riskManager = userService.get(userDO.getRiskManager());
+            requestParams.put("implementingFactoringProducts",creditResolution.getImplementingFactoringProducts());
             requestParams.put("businessNo",projectInformation.getBusinessNumber());
             requestParams.put("manager",projectManager.getName());
             requestParams.put("currency","CNY");

src/main/java/com/sunxung/factoring/service/creditresolution/impl/CreditResolutionServiceImpl.java

@@ -123,7 +123,6 @@ public class CreditResolutionServiceImpl extends ServiceImpl<CreditResolutionMap
             creditResolution.setcProjectInformationId(cProjectInformationId);
             creditResolution.setCreditType("综合授信");
             creditResolution.setDomesticFactoring("国内保理");
-            creditResolution.setImplementingFactoringProducts("贸理通");
             creditResolution.setImplementingFactoringType("池保理 有追索权 明保理 正向保理");
             ProjectAudit projectAudit = projectAuditService.lambdaQuery().eq(ProjectAudit::getcProjectInformationId, projectInformation.getId()).one();
             BigDecimal projectCreditLimit ;
@@ -198,7 +197,6 @@ public class CreditResolutionServiceImpl extends ServiceImpl<CreditResolutionMap
             creditResolution.setcProjectInformationId(cProjectInformationId);
             creditResolution.setCreditType("综合授信");
             creditResolution.setDomesticFactoring("国内保理");
-            creditResolution.setImplementingFactoringProducts("贸理通");
             creditResolution.setImplementingFactoringType("池保理 有追索权 明保理 正向保理");
             ProjectAudit projectAudit = projectAuditService.lambdaQuery().eq(ProjectAudit::getcProjectInformationId, projectInformation.getId()).one();
             BigDecimal projectCreditLimit ;