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
49418136
Commit
49418136
authored
Nov 11, 2020
by
王悦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix qobj->pobj
parent
0aad78c8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
21 deletions
+24
-21
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.js
+22
-19
igirl-channel-gateway/app/config/routes/api.js
+2
-2
No files found.
igirl-channel-gateway/app/base/api/impl/action/tradetransfer.js
View file @
49418136
...
@@ -39,7 +39,10 @@ class TradetransferAPI extends APIBase {
...
@@ -39,7 +39,10 @@ class TradetransferAPI extends APIBase {
//订单创建
//订单创建
// 2020 0828 lin 修改 匹配商标交易
// 2020 0828 lin 修改 匹配商标交易
async
acceptOrder
(
pobj
,
qobj
,
req
)
{
async
acceptOrder
(
pobj
,
qobj
,
req
)
{
if
(
!
qobj
.
BizId
)
{
if
(
!
pobj
&&!
qobj
){
console
.
log
(
"请求参数为空"
,
req
)
}
if
(
!
pobj
.
BizId
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"订单号不能为空"
,
"errorMsg"
:
"订单号不能为空"
,
...
@@ -48,7 +51,7 @@ class TradetransferAPI extends APIBase {
...
@@ -48,7 +51,7 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
q
obj
.
UserName
)
{
if
(
!
p
obj
.
UserName
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"用户不能为空"
,
"errorMsg"
:
"用户不能为空"
,
...
@@ -57,7 +60,7 @@ class TradetransferAPI extends APIBase {
...
@@ -57,7 +60,7 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
q
obj
.
Mobile
)
{
if
(
!
p
obj
.
Mobile
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"用户手机号不能为空"
,
"errorMsg"
:
"用户手机号不能为空"
,
...
@@ -66,7 +69,7 @@ class TradetransferAPI extends APIBase {
...
@@ -66,7 +69,7 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
q
obj
.
Price
)
{
if
(
!
p
obj
.
Price
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"价格不能为空"
,
"errorMsg"
:
"价格不能为空"
,
...
@@ -75,7 +78,7 @@ class TradetransferAPI extends APIBase {
...
@@ -75,7 +78,7 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
q
obj
.
RegisterNumber
)
{
if
(
!
p
obj
.
RegisterNumber
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"商标注册号不能为空"
,
"errorMsg"
:
"商标注册号不能为空"
,
...
@@ -84,7 +87,7 @@ class TradetransferAPI extends APIBase {
...
@@ -84,7 +87,7 @@ class TradetransferAPI extends APIBase {
"success"
:
false
"success"
:
false
}
}
}
}
if
(
!
q
obj
.
Classification
)
{
if
(
!
p
obj
.
Classification
)
{
return
{
return
{
"errorCode"
:
"error"
,
"errorCode"
:
"error"
,
"errorMsg"
:
"商标国际一级分类不能为空"
,
"errorMsg"
:
"商标国际一级分类不能为空"
,
...
@@ -97,20 +100,20 @@ class TradetransferAPI extends APIBase {
...
@@ -97,20 +100,20 @@ class TradetransferAPI extends APIBase {
"actionProcess"
:
"aliyuntmtransfer"
,
"actionProcess"
:
"aliyuntmtransfer"
,
"actionType"
:
"tmAccept"
,
"actionType"
:
"tmAccept"
,
"actionBody"
:
{
"actionBody"
:
{
"bizId"
:
q
obj
.
BizId
,
"bizId"
:
p
obj
.
BizId
,
"userName"
:
q
obj
.
UserName
,
"userName"
:
p
obj
.
UserName
,
"mobile"
:
q
obj
.
Mobile
,
"mobile"
:
p
obj
.
Mobile
,
"registerNumber"
:
q
obj
.
RegisterNumber
,
"registerNumber"
:
p
obj
.
RegisterNumber
,
"classification"
:
q
obj
.
Classification
,
"classification"
:
p
obj
.
Classification
,
"price"
:
q
obj
.
Price
,
"price"
:
p
obj
.
Price
,
"channelItemCode"
:
"tmjy"
,
"channelItemCode"
:
"tmjy"
,
"payCode"
:
"tmjy-1"
,
"payCode"
:
"tmjy-1"
,
"quantity"
:
1
,
"quantity"
:
1
,
"totalSum"
:
q
obj
.
Price
,
"totalSum"
:
p
obj
.
Price
,
"payTotalSum"
:
q
obj
.
Price
,
"payTotalSum"
:
p
obj
.
Price
,
"channelOrder"
:{
"channelOrder"
:{
"channelServiceNo"
:
q
obj
.
BizId
,
"channelServiceNo"
:
p
obj
.
BizId
,
"channelOrderNo"
:
q
obj
.
BizId
"channelOrderNo"
:
p
obj
.
BizId
}
}
}
}
}
}
...
@@ -129,9 +132,9 @@ class TradetransferAPI extends APIBase {
...
@@ -129,9 +132,9 @@ class TradetransferAPI extends APIBase {
var
userparam
=
{
var
userparam
=
{
actionType
:
"getLoginByUserName"
,
actionType
:
"getLoginByUserName"
,
actionBody
:
{
actionBody
:
{
"channelUserId"
:
q
obj
.
Mobile
,
"channelUserId"
:
p
obj
.
Mobile
,
"mobile"
:
q
obj
.
Mobile
,
"mobile"
:
p
obj
.
Mobile
,
"userName"
:
q
obj
.
UserName
"userName"
:
p
obj
.
UserName
}
}
};
};
var
url
=
settings
.
centerChannelUrl
()
+
"/api/opreceive/accessAuth/springBoard"
;
var
url
=
settings
.
centerChannelUrl
()
+
"/api/opreceive/accessAuth/springBoard"
;
...
...
igirl-channel-gateway/app/config/routes/api.js
View file @
49418136
...
@@ -344,7 +344,7 @@ module.exports = function (app) {
...
@@ -344,7 +344,7 @@ module.exports = function (app) {
req
.
clientIp
=
tClientIp
;
req
.
clientIp
=
tClientIp
;
req
.
uagent
=
req
.
headers
[
"user-agent"
];
req
.
uagent
=
req
.
headers
[
"user-agent"
];
req
.
classname
=
classPath
;
req
.
classname
=
classPath
;
req
.
query
=
req
.
body
var
params
=
[];
var
params
=
[];
params
.
push
(
gname
);
params
.
push
(
gname
);
params
.
push
(
methodName
);
params
.
push
(
methodName
);
...
@@ -371,7 +371,7 @@ module.exports = function (app) {
...
@@ -371,7 +371,7 @@ module.exports = function (app) {
req
.
clientIp
=
tClientIp
;
req
.
clientIp
=
tClientIp
;
req
.
uagent
=
req
.
headers
[
"user-agent"
];
req
.
uagent
=
req
.
headers
[
"user-agent"
];
req
.
classname
=
classPath
;
req
.
classname
=
classPath
;
req
.
query
=
req
.
body
params
.
push
(
gname
);
params
.
push
(
gname
);
params
.
push
(
methodName
);
params
.
push
(
methodName
);
params
.
push
(
req
.
query
);
params
.
push
(
req
.
query
);
...
...
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