Merge branch 'bpo-web' of http://gitlab.gongsibao.com/jiangyong/zhichan into bpo-web

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

@@ -447,6 +447,7 @@ class EcontractApi {
             signArr.push("userName=" + userName);
             signArr.push("key=" + busi.key);
             var calcSign = md5(signArr.join("&")).toUpperCase();
+            console.log(sign, calcSign);
             if (sign != calcSign) {
                 return {
                     code: 1,
@@ -455,8 +456,14 @@ class EcontractApi {
             }
 
             // 验证电子签
-            var list = await this.econtractSve.findSinedByThree(userName, userIdNo, userBankNo);
-            if (list.length > 0) {
+            // var list = await this.econtractSve.findSinedByThree(userName, userIdNo, userBankNo);
+            let exists = await this.bankthreelogSve.findOne({
+                userName: userName,
+                userIdNo: userIdNo,
+                userBankNo: userBankNo,
+                result: 1,
+            });
+            if (exists) {
                 btl.result = true;
                 btl.save();
                 return {
@@ -499,6 +506,7 @@ class EcontractApi {
                 };
             }
         } catch (error) {
+            console.log(error);
             return {
                 code: 500,
                 msg: "接口异常"
@@ -520,6 +528,7 @@ class EcontractApi {
                 userIdNo: userIdNo,
                 userBankNo: userBankNo,
                 userMobile: userMobile,
+                result: 1,
             });
             var sign = obj.sign || "";
             var btl = await this.bankthreelogSve.create({

bpo-web/app/base/controller/impl/userCtl.js

@@ -1042,6 +1042,7 @@ class UserCtl extends CtlBase {
         userName: pobj.userName,
         userIdNo: pobj.personsSign,
         userBankNo: pobj.bankno,
+        result: 1,
       });
 
       if (!exists) {