Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
5
51business
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
方斌
51business
Commits
7acedd53
Commit
7acedd53
authored
Sep 12, 2019
by
李尚科
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
0f6b3503
Pipeline
#13743
passed with stage
in 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
credit.js
app/router/credit.js
+1
-1
order.js
app/service/credit/order.js
+3
-1
No files found.
app/router/credit.js
View file @
7acedd53
...
...
@@ -7,7 +7,7 @@ module.exports = app => {
router
.
get
(
'/history/:type'
,
'credit.order.getRecord'
);
router
.
post
(
'/order/pay'
,
'credit.order.payOrder'
);
router
.
get
(
'/order/pay/:order_id'
,
'credit.order.payOrder'
);
router
.
post
(
'/order/wx_pay_notice'
,
'credit.order.WexinPayNotice'
);
router
.
post
(
'
third'
,
'
/order/wx_pay_notice'
,
'credit.order.WexinPayNotice'
);
router
.
get
(
'/order/check_pay/:order_id'
,
'credit.order.checkPay'
);
router
.
get
(
'/order/info/:order_id'
,
'credit.order.getOrderPayInfo'
);
...
...
app/service/credit/order.js
View file @
7acedd53
...
...
@@ -247,6 +247,8 @@ class OrderService extends Service {
const
{
transaction_id
,
trade_no
}
=
credit_pay
;
const
wexin_check_pay_ret
=
await
ctx
.
service
.
credit
.
common
.
WexinCheckPay
({
transaction_id
,
trade_no
});
if
(
wexin_check_pay_ret
)
{
const
state_time
=
moment
().
format
(
'YYYY-MM-DD HH:mm:ss'
);
await
ctx
.
prometheusModel
.
CreditOrder
.
update
({
state
:
'已支付'
,
state_time
,
pay_status
:
1
},
{
where
:
{
id
:
order
.
id
,
pay_status
:
0
}
})
return
true
;
}
return
false
;
...
...
@@ -296,7 +298,7 @@ class OrderService extends Service {
if
(
type
===
'wxpay'
)
{
let
body
=
'黑名单报告检测支付'
;
if
(
order
.
type
===
2
)
{
if
(
order
.
type
===
2
)
{
body
=
'个人通话风险检测支付'
;
}
const
data
=
{
...
...
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