gsb

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

@@ -230,12 +230,15 @@ class EcontractCtl extends CtlBase {
 
   async genContract(q, obj, req) {
     obj = obj || {};
-    var referer = req.headers.referer;
-    let userid = referer.substr(referer.indexOf('&userid=') + 8);
 
-    // if (req && req.session && req.session.user.id) {
-    //   userid = req.session.user.id;
-    // }
+    var userid;
+    if (req && req.session && req.session.user && req.session.user.id) {
+      userid = req.session.user.id;
+    } else {
+      var referer = req.headers.referer;
+      userid = referer.substr(referer.indexOf('&userid=') + 8);
+    }
+
     if (!userid) {
       return system.getErrResult2("登录失效，请重新登录");
     }
@@ -328,6 +331,11 @@ class EcontractCtl extends CtlBase {
     var thirdOrderNo = contract.id; //第三方流水号，通知回调使用---选填
     var eBaoRedirectBossUrl = this.eSignBaoRedirectBossUrl + "?ecid=" + etemplate.id + "&cb=1#/ecompany/signed";
 
+    if(user.openid3rd) {
+      // 跳转到韵达抽奖
+      eBaoRedirectBossUrl = "http://op.yundasys.com/opserver/pages/twentyActs/index.html?appid=ydwechat&openid=" + user.openid3rd;
+    }
+
     console.log({
       params: params,
       ebaoAccountId: ebaoAccountId,

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

@@ -703,6 +703,7 @@ class UserCtl extends CtlBase {
       var appId = req.query.appId || "";
       var userCode = req.query.userCode || "";
       var branchCode = req.query.branchCode || ecid;
+      var openid3rd = req.query.openid || "";
 
       var userIdNo = (req.query.userIdNo || "").trim();
 
@@ -736,6 +737,11 @@ class UserCtl extends CtlBase {
 
       var existedUser = await this.service.getUserByOpenId(openId, appkey);
       if (existedUser) {
+        var ydu = await this.service.findById(existedUser.id);
+        ydu.openid3rd = openid3rd;
+        await ydu.save();
+        existedUser.openid3rd = openid3rd;
+
         req.session.user = existedUser;
         req.session.app = app;
         var accountId = await this.cache3rdAccount(existedUser.id, accountInfo);
@@ -762,6 +768,7 @@ class UserCtl extends CtlBase {
         userId3rd: userId,
         userCode3rd: userCode,
         branchCode3rd: branchCode,
+        openid3rd: openid3rd,
       }
       existedUser = await this.service.loginWithoutGift(wxUserInfo);
       if (!existedUser) {
@@ -775,8 +782,10 @@ class UserCtl extends CtlBase {
         url = url + "&accid=" + accountId;
       }
       url = url + "&ecid=" + ecid;
+      url = url + "&userid=" + existedUser.id;
       return url;
     } catch (e) {
+      console.log(e);
       //日志记录
       logCtl.info({
         optitle: "userCtl--loginyD 异常 error",

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

@@ -53,6 +53,7 @@ module.exports = (db, DataTypes) => {
     appId3rd: DataTypes.STRING(64),
     userCode3rd: DataTypes.STRING(64),
     branchCode3rd: DataTypes.STRING(64),
+    openid3rd: DataTypes.STRING(200),
 
   }, {
     paranoid: true, //假的删除