no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -226,6 +226,7 @@ public class AdminUserLogic {
                                     signItem.setId(IdWorker.getIdStr())
                                             .setWebsitContractSignRecordId(record.getId())
                                             .setContractName(template.getContractTemplateName())
+                                            .setContractTemplatePdf(template.getContractTemplatePdf())
                                             .setContractType(template.getContractType())
                                             .setContractStatus(SignContractStatusEnum.WAIT_SIGN.getKey())
                                             .setValidDate(template.getValidDate())
@@ -253,6 +254,7 @@ public class AdminUserLogic {
                                         contractSignItem.setId(IdWorker.getIdStr())
                                                 .setWebsitContractSignRecordId(record.getId())
                                                 .setContractName(contractTemplate.getContractTemplateName())
+                                                .setContractTemplatePdf(template.getContractTemplatePdf())
                                                 .setContractType(contractTemplate.getContractType())
                                                 .setContractStatus(SignContractStatusEnum.WAIT_SIGN.getKey())
                                                 .setValidDate(template.getValidDate())

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/WebsitContractSignLogic.java

@@ -208,8 +208,13 @@ public class WebsitContractSignLogic {
             String generateContractId = IdWorker.getIdStr();
             String generateTransactionId = IdWorker.getIdStr();
             String fddParams = this.getContractParams(websit, websitFile.getId());
-            Auth4FDDUtil.generateContract(websitFile.getFadadaTemplateId(), generateContractId,
-                    websitFile.getContractName(), null, null, fddParams);
+            if (StringUtils.isNotBlank(fddParams)) {
+                Auth4FDDUtil.generateContract(websitFile.getFadadaTemplateId(), generateContractId,
+                        websitFile.getContractName(), null, null, fddParams);
+            } else {
+                Auth4FDDUtil.uploadContract(generateContractId, websitFile.getContractName(),
+                        null, websitFile.getContractTemplatePdf());
+            }
 
             JSONObject jsonObject = new JSONObject();
             jsonObject.set("contractId", generateContractId);
@@ -312,6 +317,11 @@ public class WebsitContractSignLogic {
             if (websit.getFadadaWebsitRealStatus().equals(IsYesNoEnum.YES.getKey())) {
                 return;
             }
+            if (StringUtils.isNotBlank(websit.getFadadaWebsitAuthUrl())) {
+                bean.setJump(true);
+                bean.setUrl(websit.getFadadaWebsitAuthUrl());
+                return;
+            }
         }
         CompanyInfo company = new CompanyInfo();
         company.setCompanyName(websit.getName());
@@ -378,6 +388,11 @@ public class WebsitContractSignLogic {
             if (websit.getFadadaCustomerRealStatus().equals(IsYesNoEnum.YES.getKey())) {
                 return;
             }
+            if (StringUtils.isNotBlank(websit.getFadadaCustomerAuthUrl())) {
+                bean.setJump(true);
+                bean.setUrl(websit.getFadadaCustomerAuthUrl());
+                return;
+            }
         }
 
         JSONObject personResultJson = Auth4FDDUtil.getAuthPersonUrl(websit.getFadadaCustomerId(), this.fddAuthPageModify, this.fddAuthVerifiedWay,

mall-server-api/src/main/java/com/gree/mall/manager/utils/fadada/Auth4FDDUtil.java

@@ -319,6 +319,35 @@ public class Auth4FDDUtil {
     }
 
     /**
+     * 上传合同接口
+     * @param contractId 平台自定义唯一合同编号
+     * @param title 合同标题
+     * @param file PDF模板 文件大小要求<=20MB (file或docUrl二选一)
+     * @param docUrl 文档地址 公网可访问 (file或docUrl二选一)
+     */
+    public static JSONObject uploadContract(String contractId, String title, File file, String docUrl) {
+        if (StringUtils.isBlank(contractId)) {
+            throw new RemoteServiceException("合同编号不能为空");
+        }
+        FddBaseClient baseClient = new FddBaseClient(appId, secret, version, url);
+        UploadDocsParams params = new UploadDocsParams();
+        params.setContractId(contractId); //自定义合同id
+        params.setDocTitle(title); //合同标题
+        //下列PDF模板和文档地址二选一
+        if (Objects.nonNull(file)) {
+            params.setFile(file); // PDF模板
+        } else {
+            if (StringUtils.isBlank(docUrl)) {
+                throw new RemoteServiceException("文档地址不能为空");
+            }
+            params.setDocUrl(docUrl); // 文档地址
+        }
+        params.setDocType(".pdf"); //合同类型 目前仅支持pdf格式
+        String result = baseClient.invokeUploadDocs(params);
+        return parseJson(result);
+    }
+
+    /**
      * 模板上传接口
      * @param templateId 平台自定义唯一模板编号
      * @param file PDF模板 文件大小要求<=20MB (file或docUrl二选一)