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
4f6bc45a
Commit
4f6bc45a
authored
Jan 13, 2020
by
庄冰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
aaa
parent
64cbb3da
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
2 deletions
+19
-2
igirl-channel/app/base/service/impl/dborder/orderSve.js
+5
-1
igirl-channel/app/front/entry/public/apidoc/paymentDesc/payment.md
+14
-1
No files found.
igirl-channel/app/base/service/impl/dborder/orderSve.js
View file @
4f6bc45a
...
@@ -843,7 +843,9 @@ class OrderService extends ServiceBase {
...
@@ -843,7 +843,9 @@ class OrderService extends ServiceBase {
return
system
.
getResultFail
(
-
101
,
"orderNo参数有误"
);
return
system
.
getResultFail
(
-
101
,
"orderNo参数有误"
);
}
}
var
order
=
await
this
.
dao
.
model
.
findOne
({
var
order
=
await
this
.
dao
.
model
.
findOne
({
where
:{
orderNo
:
obj
.
orderNo
,
app_id
:
obj
.
app
.
id
},
raw
:
true
where
:{
orderNo
:
obj
.
orderNo
,
app_id
:
obj
.
app
.
id
},
raw
:
true
,
attributes
:[
"id"
,
"orderNo"
,
"itemCode"
,
"itemName"
,
"channelItemCode"
,
"channelItemName"
,
"salesNum"
,
"orderPayStatus"
,
"orderPayStatusName"
,
"totalSum"
,
"created_at"
]
});
});
if
(
!
order
||
!
order
.
totalSum
){
if
(
!
order
||
!
order
.
totalSum
){
return
system
.
getResultFail
(
-
102
,
"订单数据有误"
);
return
system
.
getResultFail
(
-
102
,
"订单数据有误"
);
...
@@ -877,7 +879,9 @@ class OrderService extends ServiceBase {
...
@@ -877,7 +879,9 @@ class OrderService extends ServiceBase {
var
result
=
JSON
.
parse
(
rtn
.
stdout
);
var
result
=
JSON
.
parse
(
rtn
.
stdout
);
if
(
result
&&
result
.
status
==
0
&&
result
.
data
&&
result
.
data
.
trxid
){
if
(
result
&&
result
.
status
==
0
&&
result
.
data
&&
result
.
data
.
trxid
){
await
this
.
cacheManager
[
"ZxPayLocker"
].
init
(
result
.
data
.
trxid
);
await
this
.
cacheManager
[
"ZxPayLocker"
].
init
(
result
.
data
.
trxid
);
result
.
data
.
order
=
order
;
}
}
return
result
;
return
result
;
}
}
...
...
igirl-channel/app/front/entry/public/apidoc/paymentDesc/payment.md
View file @
4f6bc45a
...
@@ -144,7 +144,20 @@
...
@@ -144,7 +144,20 @@
"reqsn"
:
"qftTM201912281609Xr7QQ7_9"
,
"reqsn"
:
"qftTM201912281609Xr7QQ7_9"
,
"chnltrxid"
:
"112094120001045091"
,
"chnltrxid"
:
"112094120001045091"
,
"trxid"
:
"112094120001045091"
,
"trxid"
:
"112094120001045091"
,
"trxstatus"
:
"0000"
"trxstatus"
:
"0000"
,
"order"
:{
"id"
:
456
,
"orderNo"
:
"TM201912251822SEEWXj"
,
"itemCode"
:
"zzsbzc"
,
"itemName"
:
"商标自助注册"
,
"channelItemCode"
:
"商标自助注册"
,
"channelItemName"
:
"商标自助注册"
,
"salesNum"
:
1
,
"orderPayStatus"
:
"dfk"
,
"orderPayStatusName"
:
"待付款"
,
"totalSum"
:
"300.00"
,
"created_at"
:
"2019-12-25T10:22:08.000Z"
}
},
},
"requestId"
:
"2f48327473654bb897449c0263ca268d"
"requestId"
:
"2f48327473654bb897449c0263ca268d"
}
}
...
...
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