gsb

bpo-web/app/base/api/impl/econtractApi.js

@@ -794,6 +794,7 @@ class EcontractApi {
             signArr.push("userName=" + userName);
             signArr.push("key=" + busi.key);
             var calcSign = md5(signArr.join("&")).toUpperCase();
+            console.log("银行卡四要素验证密钥++++++++++++++++++++++++++++++》",calcSign);
             if (sign != calcSign) {
                 return {
                     code: 1,

bpo-web/app/base/api/impl/gemaApi.js

@@ -76,7 +76,8 @@ class GemaApi {
 
         // 查appId关联key
         var qbg = await this.qbgconfigSve.findOne({
-            appId: param.appId
+            appId: param.appId,
+            xbg_ecid: param.ecid
         });
         if (!qbg || !qbg.key) {
             return this.returnjson(1001003, "配置信息错误，请联系薪必果人员进行配置");

bpo-web/app/base/db/models/qbgconfig.js

@@ -8,8 +8,7 @@ module.exports = (db, DataTypes) => {
         initiator_account: DataTypes.STRING,
         merchant_name: DataTypes.STRING,
         ecompany_name: DataTypes.STRING,
-        phoneA: DataTypes.STRING,
-        addressA: DataTypes.STRING,
+        xbg_ecid: DataTypes.INTEGER,
         ecompany_id: DataTypes.INTEGER,
     },{
         paranoid: true,//假的删除

bpo-web/app/base/service/impl/qbgconfigSve.js

@@ -26,6 +26,8 @@ class QbgconfigService extends ServiceBase {
         let ecid = params.ecid;
         // 验证身份证是否签约过
         let todays = moment().format("YYYY-MM-DD") + " 00:00:00";
+        // dkecompany
+        var dkcompany = await this.dkcompanyDao.findById(qbg.ecompany_id);
 
         let contractId = await this.dkcontractDao.findSignedContractId({
             idno: params.idNo,
@@ -124,27 +126,27 @@ class QbgconfigService extends ServiceBase {
             appId: params.appId,
             nonceStr: params.nonceStr,
             timestamp: new Date().getTime(),
-            initiatorAccountId: qbg.initiator_account,
-            accountId: eaccount.eaccountid,
+            initiatorAccountId: qbg.initiator_account,  //企业账号（E签宝）
+            accountId: eaccount.eaccountid,             //个人账号（E签宝）
             channel: 1,
             entSealId: qbg.seal_id,
-            contractName: qbg.merchant_name,
+            contractName: dkcompany.name,   //合同名称
             simpleFormFields: {
-                nameA: qbg.merchant_name,
-                addressA: qbg.addressA,
-                phoneA: qbg.phoneA,
+                nameA: dkcompany.name,      //甲方 必填
+                addressA: dkcompany.addr,   // 甲方地址
+                phoneA: dkcompany.phone,    // 甲方电话
 
-                nameB: params.idName,
-                phoneB: params.mobile,
+                nameB: params.idName,       //乙方姓名 必填
+                phoneB: params.mobile,      //乙方电话 必填
 
-                nameC: params.idName,
-                banknoC: params.bankno,
-                phoneC: params.mobile,
-                idcardC: params.idNo,
+                nameC: params.idName,      // 乙方姓名
+                banknoC: params.bankno,    // 乙方电话
+                phoneC: params.mobile,     // 乙方身份证
+                idcardC: params.idNo,      // 乙方银行卡号
 
-                signdate: today,
+                signdate: today,           // 签约日期
             },
-            templateId: params.ecid
+            templateId: qbg.template_id    //ecid（E签宝）
         }
 
         var sign = await this.getsign(toecontract, qbg.key)
@@ -156,12 +158,11 @@ class QbgconfigService extends ServiceBase {
             data: toecontract,
         });
 
-
         console.log(econtr)
         // 创建合同
         let dkecontract = {
             name: qbg.merchant_name,
-            dktemplate_id: qbg.template_id,
+            dktemplate_id: ecid,
             user_id: eaccount.user_id,
             usereaccount_id: eaccount.id,
             dkcompany_id: qbg.ecompany_id,
@@ -311,7 +312,7 @@ class QbgconfigService extends ServiceBase {
                 signDateA: today,
                 signDateB: today
             },
-            templateId: params.ecid
+            templateId: qbg.template_id
         }
 
         var sign = await this.getsign(toecontract, qbg.key)
@@ -322,8 +323,6 @@ class QbgconfigService extends ServiceBase {
             url: this.API.autoSign,
             data: toecontract,
         });
-
-
         console.log(econtr)
         // 创建合同
         let econtract = {
@@ -332,7 +331,7 @@ class QbgconfigService extends ServiceBase {
             eflowstatus: "1",
             user_id: eaccount.user_id,
             usereaccount_id: eaccount.id,
-            etemplate_id: qbg.template_id,
+            etemplate_id: ecid,
             ecompany_id: qbg.ecompany_id,
         };
         econtract = await this.econtractDao.create(econtract);