gsb

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

@@ -211,6 +211,7 @@ class EcontractApi {
         signArr.push("key=" + busi.key);
 
         var sign = md5(signArr.join("&")).toUpperCase();
+        console.log(sign)
         if (sign != obj.sign) {
             return {
                 code: 1001001,
@@ -321,6 +322,103 @@ class EcontractApi {
         }
     }
 
+
+    async sinedEcontractStatus(obj, req) {
+        // 验证合法性
+        var appId = obj.appId;
+        var ecId = obj.ecId;
+        var idNo = obj.idNo;
+        var nonceStr = obj.nonceStr;
+
+        if (!appId) {
+            return this.returnjson(-1, "请传入薪必果提供的appId")
+        }
+        if (!ecId) {
+            return this.returnjson(-1, "请传入薪必果提供的ecid")
+        }
+        if (!idNo) {
+            return this.returnjson(-1, "请传入身份证号")
+        }
+
+        var busi = await this.ecompanybusiSve.findOne({
+            appId: appId
+        });
+        if (!busi) {
+            return {
+                code: 1001003,
+                msg: "配置信息错误，请联系薪必果人员进行配置"
+            };
+        }
+
+        var signArr = [];
+        signArr.push("appId=" + appId);
+        signArr.push("ecId" + ecId);
+        signArr.push("idNo=" + idNo);
+        signArr.push("nonceStr=" + nonceStr);
+        signArr.push("key=" + busi.key);
+
+        var sign = md5(signArr.join("&")).toUpperCase();
+        console.log(sign)
+        if (sign != obj.sign) {
+            return {
+                code: 1001001,
+                msg: "签名失败"
+            };
+        }
+        var params = {
+            etemplate_id: ecId,
+            idNo: idNo,
+        };
+
+        try {
+            var  contractStatus = await this.econtractSve.sinedEcontractStatus(params);
+
+            var result = {
+                code: 0,
+            };
+            if(contractStatus.length == 0 ){
+                result.msg = "未发起签约";
+                result.data = {
+                    status: 0,
+                    statusName: "未发起签约"
+                };
+            }else if(contractStatus.indexOf('2') != -1 ){
+                result.msg = "签约完成";
+                result.data = {
+                    status: 2,
+                    statusName: "签约完成"
+                };
+            }else if(contractStatus.indexOf('3') != -1){
+                result.msg = "签约失败";
+                result.data = {
+                    status: 3,
+                    statusName: "签约失败"
+                };
+            }else{
+                result.msg = "签约中";
+                result.data = {
+                    status: 1,
+                    statusName: "签署中"
+                };
+            }
+            return result;
+        } catch (e) {
+            var result = {
+                code: 500,
+                msg: "接口异常"
+            };
+            console.log(e.stack);
+            //日志记录
+            logCtl.error({
+                optitle: "校验是否签约error",
+                op: "api/econtractApi/validContract",
+                content: e.stack,
+                clientIp: req.clientIp
+            });
+            return result;
+        }
+    }
+
     async sinedList(obj, req) {
         // 验证合法性
         var companyName = obj.companyName;
@@ -1428,4 +1526,4 @@ class EcontractApi {
 
 }
 
-module.exports = EcontractApi;
\ No newline at end of file
+module.exports = EcontractApi;

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

@@ -54,7 +54,7 @@ class YZContractApi {
         }
         if (!await this.idcardClient.checkIDCard(param.idNo)) {
             return this.returnjson(-1, "代理人身份证格式不正确");
-        }
+    }
         let card = await this.idcardClient.cardInfo(param.idNo);
         let age = card.age || 0;
         if (!age) {

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

@@ -903,6 +903,18 @@ class EcontractService extends ServiceBase {
         return list;
     }
 
+
+    async sinedEcontractStatus(params) {
+
+        var sql = "SELECT * FROM c_econtract WHERE usereaccount_id IN ( SELECT id FROM p_user_eaccount WHERE personsSign = :idNo) AND etemplate_id = :etemplate_id";
+        var list = await this.dao.customQuery(sql,params);
+        var data  = [];
+        for (var item of list) {
+            data.push(item.eflowstatus);
+        }
+        return data;
+    }
+
     async findSignedMerchant4Push(params) {
         var sql = [];
         sql.push("SELECT t1.id,t1.begin_at as beginDate,t1.end_at as endDate,");

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

@@ -24,6 +24,8 @@ class EntcontractService extends ServiceBase {
         this.ecompanyDao = system.getObject("db.ecompanyDao");
         this.econtractDao = system.getObject("db.econtractDao");
 
+        this.etemplatebusiDao =  system.getObject("db.etemplatebusiDao");
+
 
         this.URL = "http://39.106.185.66:8000/merchant/busi/reg";
         this.YZKEY = "4a112ce87c38464d8d454caf23b7b31f";
@@ -332,6 +334,19 @@ class EntcontractService extends ServiceBase {
                 await erchants.save();
             }
 
+            var etemplatebusi =  await this.etemplatebusiDao.findOne({
+                template_id:erchants.ecid,
+                busi_id:erchants.mchtId,
+            });
+            if (!etemplatebusi) {
+                this.etemplatebusiDao.create({
+                    template_type: 1,
+                    template_id: erchants.ecid,
+                    busi_id: erchants.mchtId,
+                    busi_company_name: erchants.companyName,
+                });
+            }
+
             let busi = await this.ecompanybusiDao.findOne({
                 ecompany_id: ecompany.id,
                 etemplate_id: template.id,