Skip to content

Z
zhichan
Commit 33e3687d by 宋毅
Options

tj

parent 7083c362
Showing with 20 additions and 14 deletions
igirl-channel-web/app/base/controller/impl/trademark/tmqueryCtl.js
...@@ -247,7 +247,7 @@ class tmqueryCtl extends CtlBase { ...@@ -247,7 +247,7 @@ class tmqueryCtl extends CtlBase {
var param = { var param = {
actionProcess: pobj.actionProcess, actionProcess: pobj.actionProcess,
actionType: "createChannelUser", actionType: "createChannelUser",
actionBody: { channelUserId: pobj.channelUserId }, actionBody: { channelUserId: pobj.channelUserId, channelUserMoblie: pobj.channelUserMoblie || "" },
isUser: "yes" isUser: "yes"
}; };
var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard"; var reqUrl = this.channelApiUrl + "/action/tmTools/springBoard";
...@@ -377,26 +377,31 @@ class tmqueryCtl extends CtlBase { ...@@ -377,26 +377,31 @@ class tmqueryCtl extends CtlBase {
ctx.headers.set('content-type', 'application/json'); ctx.headers.set('content-type', 'application/json');
let credentials = { let credentials = {
accessKeyId: '7CCB9D55C8DB52DD943CC5B00DDA6F44', //替换自己的AK accessKeyId: 'A46DC38C2435B0FFF8615B284B958A93', //替换自己的AK
secretAccessKey: '1C83C868AD9FA00F6D56DBF2CAE5A8DF' //替换自己的SK--jd>>>>>>> secretAccessKey: '0D661D3C4890563AE73B7AE50C6207A8' //替换自己的SK--jd>>>>>>>
} }
//测试报文： //测试报文：
//ctx.body = "pin=jcloud_pRiHQTd&serviceId=580010&itemCode=FW_GOODS-580010-1&platform=6" //ctx.body = "pin=jcloud_pRiHQTd&serviceId=580010&itemCode=FW_GOODS-580010-1&platform=6"
//POST //POST
var qs = require('querystring'); var qs = require('querystring');
// var post_data = { pin: "syaify", serviceId: 580010, itemCode: "FW_GOODS-580010-1", platform: 6, orderNum: 1, articleType: 1 };//这是需要提交的数据 // var post_data = {
// pin: req.session.userPinInfo.channelUserId,
// serviceId: itemCodeList[1],
// itemCode: itemCode,
// platform: 6,
// orderNum: 1,
// articleType: 1,
// additions: '{ \"247\": 0 }'
// };//这是需要提交的数据------有附加项
var post_data = { var post_data = {
pin: req.session.userPinInfo.channelUserId, pin: req.session.userPinInfo.channelUserId,
serviceId: itemCodeList[1], serviceId: itemCodeList[1],
itemCode: itemCode, itemCode: itemCode,
platform: 6, platform: 6,
orderNum: 1, orderNum: 1,
articleType: 1, articleType: 1
additions: '{ \"247\": 0 }'
};//这是需要提交的数据 };//这是需要提交的数据
// var tmpContent = '{"pin":"syaify","serviceId":"581976","itemCode":"FW_GOODS-581976","platform":6,"orderNum":1,"articleType":1,"additions":{"246":0}}';
var tmpContent = JSON.stringify(post_data); var tmpContent = JSON.stringify(post_data);
var tmpContentLength = Buffer.byteLength(tmpContent); var tmpContentLength = Buffer.byteLength(tmpContent);
ctx.body = tmpContent; ctx.body = tmpContent;
...@@ -458,7 +463,7 @@ class tmqueryCtl extends CtlBase { ...@@ -458,7 +463,7 @@ class tmqueryCtl extends CtlBase {
} }
async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息 async pushJdPayOrder(pushData, req) {//处理京东推送的订单信息
try { try {
var signResult = await this.createSign(pushData, "698FC4A1CBA6F999F023DF5ECA982181", true); var signResult = await this.createSign(pushData, "F6FBD101C7571ADE231670F080653874", true);
if (signResult.status != 0) { if (signResult.status != 0) {
return signResult; return signResult;
} }
...@@ -538,7 +543,7 @@ class tmqueryCtl extends CtlBase { ...@@ -538,7 +543,7 @@ class tmqueryCtl extends CtlBase {
channelUserId: req.session.userPinInfo.channelUserId, channelUserId: req.session.userPinInfo.channelUserId,
channelItemCode: pobj.actionBody.itemCode, channelItemCode: pobj.actionBody.itemCode,
order_param: { order_param: {
mobile_phone: pobj.actionBody.apply.mobile || "18888888888",//必填 mobile_phone: req.session.userPinInfo.userMoblie || "18888888888",//必填
goods_list: [{//必填 goods_list: [{//必填
goods_name: pobj.actionBody.itemCode, goods_name: pobj.actionBody.itemCode,
goods_quantity: 1, goods_quantity: 1,
......
igirl-channel-web/app/config/routes/web.js
...@@ -8,7 +8,7 @@ const jwt = require('jsonwebtoken'); ...@@ -8,7 +8,7 @@ const jwt = require('jsonwebtoken');
const secret = '3rZ3aNfGAyQAB4sE'; //自定义 const secret = '3rZ3aNfGAyQAB4sE'; //自定义
module.exports = function (app) { module.exports = function (app) {
app.get("/admin", async function (req, res) { app.get("/admin", async function (req, res) {
res.redirect("http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=OAjdlist&client_id=9841572588670903"); res.redirect("http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=OAjdlist&client_id=9491577327154697");
return; return;
}); });
...@@ -192,7 +192,8 @@ module.exports = function (app) { ...@@ -192,7 +192,8 @@ module.exports = function (app) {
} }
var getUserparams = { var getUserparams = {
actionProcess: "gsbhome", actionProcess: "gsbhome",
channelUserId: userInfo.data.phone + "_" + userInfo.data.id channelUserId: userInfo.data.phone + "_" + userInfo.data.id,
channelUserMoblie: userInfo.data.phone
}; };
var userItemResult = await tmqueryCtl.getUserIdEncryptStr(getUserparams, req.query, req); var userItemResult = await tmqueryCtl.getUserIdEncryptStr(getUserparams, req.query, req);
if (userItemResult.status != 0) { if (userItemResult.status != 0) {
......
igirl-channel-web/app/front/vues/pages/jdtrademark/jdtrademark.js
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
methods: { methods: {
/*全选 */ /*全选 */
goIndentList(){ goIndentList(){
location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9841572588670903"; location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=jdindentlist&client_id=9491577327154697";
}, },
handleCheckAllChange(val) { handleCheckAllChange(val) {
if (val) { if (val) {
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
if (code.channelItemCode) { if (code.channelItemCode) {
switch (code.itemCode) { switch (code.itemCode) {
case "zzsbzc": case "zzsbzc":
location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=selftmreg&client_id=9841572588670903"; location.href="http://oauth2.jdcloud.com/authorize?response_type=token&redirect_uri=http://tm.plus.jdcloud.com/jdtm/getUser&state=selftmreg&client_id=9491577327154697";
/*this.$router.push({ path: "/jd/selftmreg", query: {} });*/ /*this.$router.push({ path: "/jd/selftmreg", query: {} });*/
break; break;
case "fzsbzc": case "fzsbzc":
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment