Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Z
zhichan
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
蒋勇
zhichan
Commits
b173fe85
Commit
b173fe85
authored
Nov 11, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
阿里下订单走igirl_channel->老加西亚
parent
49418136
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
248 additions
and
97 deletions
+248
-97
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.bak20201111wy
+211
-0
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.js
+35
-95
igirl-channel-gateway/app/config/settings.js
+2
-2
No files found.
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.bak20201111wy
0 → 100644
View file @
b173fe85
const system = require("../../../system");
var settings = require("../../../../config/settings");
var APIBase = require("../../api.base");
class TradetransferAPI extends APIBase {
constructor() {
super();
this.execlient = system.getObject("util.execClient");
this.utilsNeedSve = system.getObject("service.utilsSve.utilsNeedSve");
this.channelApiUrl = settings.channelApiUrl();
this.centerChannelUrl = settings.centerChannelUrl();
this.appInfo = {
aliyuntmtransfer: { appkey: settings.appKey, secret: settings.secret }
};
}
async getToken() {
var self = this;
var reqTokenUrl = this.channelApiUrl + "/web/auth/accessAuth/getAppTokenByHosts";
// var reqParam = self.appInfo["aliyuntmtransfer"];
var reqParam = {
"actionType": "getAppTokenByHosts",
"actionBody": {}
}
// if (!reqParam.appkey || !reqParam.secret) {
// return system.getResult(null, "reqType类型有误,请求失败");
// }
var rtn = await this.execlient.execPost(reqParam, reqTokenUrl);
if (!rtn.stdout) {
return system.getResult(null, "获取token失败");
}
var tokenResult = JSON.parse(rtn.stdout);
if (tokenResult.status == 0) {
tokenResult.data.secret = reqParam.secret;
}
return tokenResult;
}
//订单创建
// 2020 0828 lin 修改 匹配商标交易
async acceptOrder(pobj,qobj,req) {
if (!pobj&&!qobj){
console.log("请求参数为空",req)
}
if (!pobj.BizId) {
return {
"errorCode": "error",
"errorMsg": "订单号不能为空",
"module": { "orderNumber": "" },
"eequestId": req.requestId,
"success": false
}
}
if (!pobj.UserName) {
return {
"errorCode": "error",
"errorMsg": "用户不能为空",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
}
}
if (!pobj.Mobile) {
return {
"errorCode": "error",
"errorMsg": "用户手机号不能为空",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
}
}
if (!pobj.Price) {
return {
"errorCode": "error",
"errorMsg": "价格不能为空",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
}
}
if (!pobj.RegisterNumber) {
return {
"errorCode": "error",
"errorMsg": "商标注册号不能为空",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
}
}
if (!pobj.Classification) {
return {
"errorCode": "error",
"errorMsg": "商标国际一级分类不能为空",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
}
}
var sobj = {
"actionProcess": "aliyuntmtransfer",
"actionType": "tmAccept",
"actionBody": {
"bizId": pobj.BizId,
"userName": pobj.UserName,
"mobile": pobj.Mobile,
"registerNumber": pobj.RegisterNumber,
"classification": pobj.Classification,
"price": pobj.Price,
"channelItemCode":"tmjy",
"payCode": "tmjy-1",
"quantity":1,
"totalSum": pobj.Price,
"payTotalSum": pobj.Price,
"channelOrder":{
"channelServiceNo": pobj.BizId,
"channelOrderNo": pobj.BizId
}
}
}
// 获取token
var tokenInfo = await this.getToken();
if (tokenInfo.status != 0) {
return {
"errorCode": "error",
"errorMsg": "渠道验证失败",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
};
}
// 获取userpin
var userparam = {
actionType: "getLoginByUserName",
actionBody: {
"channelUserId": pobj.Mobile,
"mobile": pobj.Mobile,
"userName": pobj.UserName
}
};
var url = settings.centerChannelUrl() + "/api/opreceive/accessAuth/springBoard";
var userpinResultTmp = await this.execlient.execPostTK(userparam, url, tokenInfo.data.token);
if (userpinResultTmp.status != 0 && userpinResultTmp.status != 2060) {
return {
"errorCode": "error",
"errorMsg": "用户验证失败",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
};
}
// 调取channel 开始业务
var url = this.channelApiUrl + "/web/opaction/tmOrder/springBoard";
// var rtn = await this.execlient.execPostTK(sobj, url, tokenInfo.data.token);
var rtn = rtn = await this.execlient.execDataPostByTokenUserPin(sobj, url, tokenInfo.data.token, userpinResultTmp.data.userpin);
if (!rtn.stdout) {
return {
"errorCode": "error",
"errorMsg": "建立订单失败",
"module": { "orderNumber": "" },
"requestId": req.requestId,
"success": false
};
}
return JSON.parse(rtn.stdout);
}
//订单查询
async queryOrderState(p,obj) {
var sobj = {
"actionProcess": "aliyuntmtransfer",
"actionType": "aliclient",
"sign": "2FviZ9PGws8Pt1fBhq0t90mjUvI",
"actionBody": p
}
var tokenInfo = await this.getToken();
console.log(tokenInfo);
var url = this.channelApiUrl + "/action/tradetransfer/ordersel";
var rtn = await this.execlient.execPostTK(sobj, url, tokenInfo.data.token);
console.log(rtn);
// var rtn = await this.execlient.execPostTK(sobj, url,"token");
return rtn;
}
//订单关闭
async tmRefuse(p,obj,req) {
var sobj = {
"actionProcess": "aliyuntmtransfer",
"actionType": "tmRefuse",
"actionBody": {
bizId: obj.BizId
}
}
var tokenInfo = await this.getToken();
var url = this.channelApiUrl + "/web/opaction/tmOrder/springBoard";
var rtn = await this.execlient.execPostTK(sobj, url, tokenInfo.data.token);
// var rtn = await this.execlient.execPostTK(sobj, url,"token");
return rtn;
}
//查询咨询客户列表
async queryTradeIntentionUserList(p,obj) {
let sobj = {
"actionType": "QueryTradeIntentionUserList",
};
let tokenInfo = await this.utilsNeedSve.getCenterToken();
let url = this.centerChannelUrl + "/web/trade/brand/springBoard";
return await this.execlient.execPostTK(sobj, url, tokenInfo.data.token);
}
}
module.exports = TradetransferAPI;
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.js
View file @
b173fe85
...
@@ -16,15 +16,11 @@ class TradetransferAPI extends APIBase {
...
@@ -16,15 +16,11 @@ class TradetransferAPI extends APIBase {
async
getToken
()
{
async
getToken
()
{
var
self
=
this
;
var
self
=
this
;
var
reqTokenUrl
=
this
.
channelApiUrl
+
"/web/auth/accessAuth/getAppTokenByHosts"
;
var
reqTokenUrl
=
this
.
channelApiUrl
+
"/auth/accessAuth/getToken"
;
// var reqParam = self.appInfo["aliyuntmtransfer"];
var
reqParam
=
self
.
appInfo
[
"aliyuntmtransfer"
];
var
reqParam
=
{
if
(
!
reqParam
.
appkey
||
!
reqParam
.
secret
)
{
"actionType"
:
"getAppTokenByHosts"
,
return
system
.
getResult
(
null
,
"reqType类型有误,请求失败"
);
"actionBody"
:
{}
}
}
// if (!reqParam.appkey || !reqParam.secret) {
// return system.getResult(null, "reqType类型有误,请求失败");
// }
var
rtn
=
await
this
.
execlient
.
execPost
(
reqParam
,
reqTokenUrl
);
var
rtn
=
await
this
.
execlient
.
execPost
(
reqParam
,
reqTokenUrl
);
if
(
!
rtn
.
stdout
)
{
if
(
!
rtn
.
stdout
)
{
return
system
.
getResult
(
null
,
"获取token失败"
);
return
system
.
getResult
(
null
,
"获取token失败"
);
...
@@ -37,17 +33,13 @@ class TradetransferAPI extends APIBase {
...
@@ -37,17 +33,13 @@ class TradetransferAPI extends APIBase {
}
}
//订单创建
//订单创建
// 2020 0828 lin 修改 匹配商标交易
async
acceptOrder
(
pobj
,
qobj
,
req
)
{
async
acceptOrder
(
pobj
,
qobj
,
req
)
{
if
(
!
pobj
&&!
qobj
){
console
.
log
(
"请求参数为空"
,
req
)
}
if
(
!
pobj
.
BizId
)
{
if
(
!
pobj
.
BizId
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"订单号不能为空"
,
"errorMsg"
:
"订单号不能为空"
,
"module"
:
{
"orderNumber"
:
""
},
"module"
:
{
"orderNumber"
:
""
},
"
e
equestId"
:
req
.
requestId
,
"
r
equestId"
:
req
.
requestId
,
"success"
:
false
"success"
:
false
}
}
}
}
...
@@ -78,90 +70,39 @@ class TradetransferAPI extends APIBase {
...
@@ -78,90 +70,39 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
pobj
.
RegisterNumber
)
{
return
{
"errorCode"
:
"error"
,
"errorMsg"
:
"商标注册号不能为空"
,
"module"
:
{
"orderNumber"
:
""
},
"requestId"
:
req
.
requestId
,
"success"
:
false
}
}
if
(
!
pobj
.
Classification
)
{
return
{
"errorCode"
:
"error"
,
"errorMsg"
:
"商标国际一级分类不能为空"
,
"module"
:
{
"orderNumber"
:
""
},
"requestId"
:
req
.
requestId
,
"success"
:
false
}
}
var
sobj
=
{
var
sobj
=
{
"actionProcess"
:
"aliyuntmtransfer"
,
"actionProcess"
:
"aliyuntmtransfer"
,
"actionType"
:
"tmAccept"
,
"actionType"
:
"aliclient"
,
"sign"
:
"2FviZ9PGws8Pt1fBhq0t90mjUvI"
,
"isUser"
:
"yes"
,
"actionBody"
:
{
"actionBody"
:
{
"bizId"
:
pobj
.
BizId
,
"itemCode"
:
"alitmtt"
,
"userName"
:
pobj
.
UserName
,
"channelParams"
:
pobj
,
"mobile"
:
pobj
.
Mobile
,
"channelUser"
:
{
"registerNumber"
:
pobj
.
RegisterNumber
,
"channelUserId"
:
pobj
.
Mobile
,
"classification"
:
pobj
.
Classification
,
"channelUserName"
:
pobj
.
UserName
,
"price"
:
pobj
.
Price
,
"channelUserMoblie"
:
pobj
.
Mobile
,
"channelItemCode"
:
"tmjy"
,
"nickname"
:
""
,
"payCode"
:
"tmjy-1"
,
"orgName"
:
""
,
"quantity"
:
1
,
"orgPath"
:
""
"totalSum"
:
pobj
.
Price
,
},
"payTotalSum"
:
pobj
.
Price
,
"channelOrder"
:
{
"channelOrder"
:{
"channelServiceNo"
:
pobj
.
BizId
,
"channelServiceNo"
:
pobj
.
BizId
,
"channelOrderNo"
:
pobj
.
BizId
"channelOrderNo"
:
""
,
"needNo"
:
pobj
.
BizId
,
"quantity"
:
1
,
"totalSum"
:
parseInt
(
pobj
.
Price
),
"payTotalSum"
:
parseInt
(
pobj
.
Price
)
*
0.2
,
"payStatus"
:
"bfyfk"
,
"payTime"
:
(
new
Date
()).
Format
(
"yyyy-MM-dd hh:mm:ss"
)
}
}
}
}
}
}
// 获取token
var
tokenInfo
=
await
this
.
getToken
();
var
tokenInfo
=
await
this
.
getToken
();
if
(
tokenInfo
.
status
!=
0
)
{
var
url
=
this
.
channelApiUrl
+
"/action/tradetransfer/createtransfer"
;
return
{
var
rtn
=
await
this
.
execlient
.
execPostTK
(
sobj
,
url
,
tokenInfo
.
data
.
token
);
"errorCode"
:
"error"
,
//var rtn = await this.execlient.execPostTK(sobj, url,"token");
"errorMsg"
:
"渠道验证失败"
,
return
rtn
;
"module"
:
{
"orderNumber"
:
""
},
"requestId"
:
req
.
requestId
,
"success"
:
false
};
}
// 获取userpin
var
userparam
=
{
actionType
:
"getLoginByUserName"
,
actionBody
:
{
"channelUserId"
:
pobj
.
Mobile
,
"mobile"
:
pobj
.
Mobile
,
"userName"
:
pobj
.
UserName
}
};
var
url
=
settings
.
centerChannelUrl
()
+
"/api/opreceive/accessAuth/springBoard"
;
var
userpinResultTmp
=
await
this
.
execlient
.
execPostTK
(
userparam
,
url
,
tokenInfo
.
data
.
token
);
if
(
userpinResultTmp
.
status
!=
0
&&
userpinResultTmp
.
status
!=
2060
)
{
return
{
"errorCode"
:
"error"
,
"errorMsg"
:
"用户验证失败"
,
"module"
:
{
"orderNumber"
:
""
},
"requestId"
:
req
.
requestId
,
"success"
:
false
};
}
// 调取channel 开始业务
var
url
=
this
.
channelApiUrl
+
"/web/opaction/tmOrder/springBoard"
;
// var rtn = await this.execlient.execPostTK(sobj, url, tokenInfo.data.token);
var
rtn
=
rtn
=
await
this
.
execlient
.
execDataPostByTokenUserPin
(
sobj
,
url
,
tokenInfo
.
data
.
token
,
userpinResultTmp
.
data
.
userpin
);
if
(
!
rtn
.
stdout
)
{
return
{
"errorCode"
:
"error"
,
"errorMsg"
:
"建立订单失败"
,
"module"
:
{
"orderNumber"
:
""
},
"requestId"
:
req
.
requestId
,
"success"
:
false
};
}
return
JSON
.
parse
(
rtn
.
stdout
);
}
}
//订单查询
//订单查询
async
queryOrderState
(
p
,
obj
)
{
async
queryOrderState
(
p
,
obj
)
{
...
@@ -181,16 +122,15 @@ class TradetransferAPI extends APIBase {
...
@@ -181,16 +122,15 @@ class TradetransferAPI extends APIBase {
}
}
//订单关闭
//订单关闭
async
tmRefuse
(
p
,
obj
,
req
)
{
async
closeOrder
(
p
,
obj
)
{
var
sobj
=
{
var
sobj
=
{
"actionProcess"
:
"aliyuntmtransfer"
,
"actionProcess"
:
"aliyuntmtransfer"
,
"actionType"
:
"tmRefuse"
,
"actionType"
:
"aliclient"
,
"actionBody"
:
{
"sign"
:
"2FviZ9PGws8Pt1fBhq0t90mjUvI"
,
bizId
:
obj
.
BizId
"actionBody"
:
p
}
}
}
var
tokenInfo
=
await
this
.
getToken
();
var
tokenInfo
=
await
this
.
getToken
();
var
url
=
this
.
channelApiUrl
+
"/
web/opaction/tmOrder/springBoard
"
;
var
url
=
this
.
channelApiUrl
+
"/
action/tradetransfer/orderclose
"
;
var
rtn
=
await
this
.
execlient
.
execPostTK
(
sobj
,
url
,
tokenInfo
.
data
.
token
);
var
rtn
=
await
this
.
execlient
.
execPostTK
(
sobj
,
url
,
tokenInfo
.
data
.
token
);
// var rtn = await this.execlient.execPostTK(sobj, url,"token");
// var rtn = await this.execlient.execPostTK(sobj, url,"token");
return
rtn
;
return
rtn
;
...
...
igirl-channel-gateway/app/config/settings.js
View file @
b173fe85
...
@@ -38,8 +38,8 @@ var settings = {
...
@@ -38,8 +38,8 @@ var settings = {
// return "http://192.168.210.192:4003";
// return "http://192.168.210.192:4003";
return
"http://ali.qifu.gongsibao.com:4012"
;
return
"http://ali.qifu.gongsibao.com:4012"
;
}
else
{
}
else
{
//
return "http://zc-channel-service";
return
"http://zc-channel-service"
;
return
"http://ali.qifu.gongsibao.com"
;
//
return "http://ali.qifu.gongsibao.com";
}
}
},
},
centerChannelUrl
:
function
()
{
//---------center-channel
centerChannelUrl
:
function
()
{
//---------center-channel
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment