FengChaoYu 5 ヶ月 前
コミット
1af15dae86

+ 27 - 0
mall-server-api/src/main/java/com/gree/mall/manager/config/FDDStartRunConfig.java

@@ -0,0 +1,27 @@
+package com.gree.mall.manager.config;
+
+import com.gree.mall.manager.utils.fadada.Auth4FDDUtil;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+
+@Component
+public class FDDStartRunConfig {
+
+
+    @Value("${fadada.app.id}")
+    private String fddAppid;
+    @Value("${fadada.app.secret}")
+    private String fddAppSecret;
+    @Value("${fadada.app.v}")
+    private String fddAppVersion;
+    @Value("${fadada.app.host}")
+    private String fddAppHost;
+
+
+    @PostConstruct
+    public void initFDDVal() {
+        Auth4FDDUtil.setMainValue(fddAppid, fddAppSecret, fddAppVersion, fddAppHost);
+    }
+}

+ 3 - 0
mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/ContractTemplateLogic.java

@@ -73,6 +73,9 @@ public class ContractTemplateLogic {
             throw new RemoteServiceException("合同类型不能为空");
         }
         if (contractTemplate.getContractType().equals(ContractTypeEnum.FOLLOW.getKey())) {
+            contractTemplate.setFollowContractTemplateId("");
+        }
+        if (contractTemplate.getContractType().equals(ContractTypeEnum.MAIN.getKey())) {
 
         }
     }

+ 18 - 0
mall-server-api/src/main/resources/bootstrap-dev.properties

@@ -110,4 +110,22 @@ unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
 unicome.yunh.appid=69jpgmwqxyhtcsor
 
+#法大大
+fadada.app.id=401793
+fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL
+fadada.app.v=2.0
+fadada.app.host=https://testapi04.fadada.com/api/
+fadada.company.auth.page-modify=1
+fadada.company.auth.verified-way=3
+fadada.company.auth.return.url=
+fadada.company.auth.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth
+fadada.company.auth.auto.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth/auto
+fadada.company.sign.return.url=
+fadada.company.sign.notify.url=${jiasm.system.url}/fdd/notify/company/ca/sign
+fadada.websit.auth.page-modify=1
+fadada.websit.auth.verified-way=3
+fadada.websit.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/auth
+fadada.websit.sign.notify.url=${jiasm.system.url}/fdd/notify/websit/batch/sign
+fadada.websit.person.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/person
+
 

+ 19 - 1
mall-server-api/src/main/resources/bootstrap-prd.propertiesb

@@ -90,4 +90,22 @@ management.health.elasticsearch.enabled=false
 unicome.yunh.baseurl=https://a5.7x24cc.com
 unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
-unicome.yunh.appid=69jpgmwqxyhtcsor
+unicome.yunh.appid=69jpgmwqxyhtcsor
+
+#法大大
+fadada.app.id=401793
+fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL
+fadada.app.v=2.0
+fadada.app.host=https://testapi04.fadada.com/api/
+fadada.company.auth.page-modify=1
+fadada.company.auth.verified-way=3
+fadada.company.auth.return.url=
+fadada.company.auth.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth
+fadada.company.auth.auto.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth/auto
+fadada.company.sign.return.url=
+fadada.company.sign.notify.url=${jiasm.system.url}/fdd/notify/company/ca/sign
+fadada.websit.auth.page-modify=1
+fadada.websit.auth.verified-way=3
+fadada.websit.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/auth
+fadada.websit.sign.notify.url=${jiasm.system.url}/fdd/notify/websit/batch/sign
+fadada.websit.person.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/person

+ 19 - 1
mall-server-api/src/main/resources/bootstrap-test.properties

@@ -97,4 +97,22 @@ cmc.bank.uid=B000012532
 unicome.yunh.baseurl=https://a5.7x24cc.com
 unicome.yunh.account=N000000015221
 unicome.yunh.secret=fe443fc0264411ec80212baafe602ea7
-unicome.yunh.appid=69jpgmwqxyhtcsor
+unicome.yunh.appid=69jpgmwqxyhtcsor
+
+#法大大
+fadada.app.id=401793
+fadada.app.secret=eB8mlIWs7ayFihEzWbNfMjrL
+fadada.app.v=2.0
+fadada.app.host=https://testapi04.fadada.com/api/
+fadada.company.auth.page-modify=1
+fadada.company.auth.verified-way=3
+fadada.company.auth.return.url=
+fadada.company.auth.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth
+fadada.company.auth.auto.notify.url=${jiasm.system.url}/fdd/notify/company/ca/auth/auto
+fadada.company.sign.return.url=
+fadada.company.sign.notify.url=${jiasm.system.url}/fdd/notify/company/ca/sign
+fadada.websit.auth.page-modify=1
+fadada.websit.auth.verified-way=3
+fadada.websit.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/auth
+fadada.websit.sign.notify.url=${jiasm.system.url}/fdd/notify/websit/batch/sign
+fadada.websit.person.auth.notify.url=${jiasm.system.url}/fdd/notify/websit/person