Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan…

Merge branch 'igirl-channel-jdweb' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel-jdweb

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

@@ -161,24 +161,30 @@ class tmqueryCtl extends CtlBase {
     try {
     try {
       var authUrl = pobj.authUrl;
       var authUrl = pobj.authUrl;
       var authToken = pobj.authToken;
       var authToken = pobj.authToken;
+      var actionProcess = pobj.actionProcess;
       if (!authUrl) {
       if (!authUrl) {
         return system.getResult(null, "authUrl不能为空");
         return system.getResult(null, "authUrl不能为空");
       }
       }
       if (!authToken) {
       if (!authToken) {
         return system.getResult(null, "authToken不能为空");
         return system.getResult(null, "authToken不能为空");
       }
       }
+      if (!actionProcess) {
+        return system.getResult(null, "actionProcess不能为空");
+      }
       var result = await this.execClient.execPostJDTK("", authUrl, authToken);
       var result = await this.execClient.execPostJDTK("", authUrl, authToken);
       console.log(result, "execPostJDTK............");
       console.log(result, "execPostJDTK............");
       if (!result || !result.account) {
       if (!result || !result.account) {
         return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
         return system.getResult(null, "处理用户请求失败,msg:" + result.error_description);
       }
       }
-      var tokenInfo = await this.getToken(pobj.actionProcess);
+      var tokenInfo = await this.getToken(actionProcess);
       console.log(tokenInfo, "getUserInfo..................getToken............");
       console.log(tokenInfo, "getUserInfo..................getToken............");
       if (tokenInfo.status != 0) {
       if (tokenInfo.status != 0) {
         return tokenInfo;
         return tokenInfo;
       }
       }
       //有返回用户信息进行用户ID加密
       //有返回用户信息进行用户ID加密
       var param = {
       var param = {
+        actionProcess: actionProcess,
+        actionType: "createChannelUser",
         actionBody: { channelUserId: result.account },
         actionBody: { channelUserId: result.account },
         isUser: "yes"
         isUser: "yes"
       };
       };

igirl-channel-jdweb/app/base/db/metadata/index.js

@@ -19,7 +19,7 @@ function initAppBizs(appJson){
         const bizConfig=require(bizfilePath);
         const bizConfig=require(bizfilePath);
         appJson.config.bizs[bizCode].config=bizConfig;
         appJson.config.bizs[bizCode].config=bizConfig;
       }catch(e){
       }catch(e){
-        console.log("bizconfig meta file not exist........");
+        // console.log("bizconfig meta file not exist........");
       }
       }
 
 
     }
     }

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

@@ -23,7 +23,9 @@ module.exports = function (app) {
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		var skipUrl = "/#/jd/" + params.state + "?channelUserId=" + encodeURIComponent(userItemResult.data.encryptChannelUserId);
 		res.redirect(skipUrl);
 		res.redirect(skipUrl);
 	});
 	});
-	app.get("/jdtm/orderNotify", async function (req, res) {
+	app.get("/jd/orderNotify", async function (req, res) {
+		console.log(req.query, "req.query.....########################################################.................orderNotify");
+		console.log(req.body, "req.body......########################################################................orderNotify");
 		//TODO:处理新购
 		//TODO:处理新购
 	});
 	});
 	app.get("/", async function (req, res) {
 	app.get("/", async function (req, res) {