tj

igirl-channel-jdweb/app/base/controller/impl/trademark/tmqueryCtl.js

@@ -181,31 +181,15 @@ class tmqueryCtl extends CtlBase {
 
   async getUserInfo(pobj, qobj, req) {
     try {
-      var authUrl = pobj.authUrl;
-      var authToken = pobj.authToken;
-      var actionProcess = pobj.actionProcess;
-      if (!authUrl) {
-        return system.getResult(null, "authUrl不能为空");
-      }
-      if (!authToken) {
-        return system.getResult(null, "authToken不能为空");
-      }
-      if (!actionProcess) {
-        return system.getResult(null, "actionProcess不能为空");
-      }
-      var result = await this.execClient.execPostJDTK("", authUrl, authToken);
-      if (!result || !result.account) {
-        return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
-      }
-      var tokenInfo = await this.getToken(actionProcess);
+      var tokenInfo = await this.getToken(pobj.actionProcess);
       if (tokenInfo.status != 0) {
         return tokenInfo;
       }
       //有返回用户信息进行用户ID加密
       var param = {
-        actionProcess: actionProcess,
+        actionProcess: pobj.actionProcess,
         actionType: "createChannelUser",
-        actionBody: { channelUserId: result.account },
+        actionBody: { channelUserId: pobj.tmpchannelUserId },
         isUser: "yes"
       };
       var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard";
@@ -215,6 +199,43 @@ class tmqueryCtl extends CtlBase {
       }
       req.session.userPinInfo = resultUser.data;
       return resultUser;
+
+
+
+      // var authUrl = pobj.authUrl;
+      // var authToken = pobj.authToken;
+      // var actionProcess = pobj.actionProcess;
+      // if (!authUrl) {
+      //   return system.getResult(null, "authUrl不能为空");
+      // }
+      // if (!authToken) {
+      //   return system.getResult(null, "authToken不能为空");
+      // }
+      // if (!actionProcess) {
+      //   return system.getResult(null, "actionProcess不能为空");
+      // }
+      // var result = await this.execClient.execPostJDTK("", authUrl, authToken);
+      // if (!result || !result.account) {
+      //   return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
+      // }
+      // var tokenInfo = await this.getToken(actionProcess);
+      // if (tokenInfo.status != 0) {
+      //   return tokenInfo;
+      // }
+      // //有返回用户信息进行用户ID加密
+      // var param = {
+      //   actionProcess: actionProcess,
+      //   actionType: "createChannelUser",
+      //   actionBody: { channelUserId: result.account },
+      //   isUser: "yes"
+      // };
+      // var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard";
+      // var resultUser = await this.execClient.execPostTK(param, reqUrl, tokenInfo.data.token);
+      // if (!resultUser) {
+      //   return system.getResult(null, "处理请求失败");
+      // }
+      // req.session.userPinInfo = resultUser.data;
+      // return resultUser;
     } catch (error) {
       console.log(error.stack, "操作error...................");
       return system.getResultFail(-200, "操作error");

igirl-channel-jdweb/app/config/routes/web.js

@@ -13,7 +13,8 @@ module.exports = function (app) {
 		var getUserparams = {
 			actionProcess: "jd",
 			authUrl: "https://oauth2.jdcloud.com/userinfo",
-			authToken: params.token_type + " " + params.access_token
+			authToken: params.token_type + " " + params.access_token,
+			tmpchannelUserId: params.tmpchannelUserId
 		};
 		var userItemResult = await tmqueryCtl.getUserInfo(getUserparams, req.query, req);
 		if (userItemResult.status != 0) {
@@ -30,7 +31,7 @@ module.exports = function (app) {
 		// 	content: "req.query=" + JSON.stringify(req.query) + "，req.body=" + JSON.stringify(req.body),
 		// 	clientIp: ""
 		// });
-		req.query.actionProcess="jd";
+		req.query.actionProcess = "jd";
 		var result = await tmqueryCtl.pushJdOrder(req.query, req);
 		// oplogCtl.info({
 		// 	optitle: "############################################操作订单结果.................orderNotify",