Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
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
chenchuanwen
my-yaf-project
Commits
37e425ea
Commit
37e425ea
authored
Dec 20, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
定时器问题
parent
0621e68e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
TencentPay.php
application/library/Payment/TencentPay.php
+1
-0
OrderService.php
application/models/Business/Order/OrderService.php
+7
-1
No files found.
application/library/Payment/TencentPay.php
View file @
37e425ea
...
...
@@ -123,6 +123,7 @@ class TencentPay {
$this
->
parameters
[
'nonce_str'
]
=
\Our\CommonExtension
::
createNoncestr
(
32
);
$this
->
postXml
(
$this
->
orderquery_url
);
$this
->
result
=
$this
->
xmlToArray
(
$this
->
response
);
\Our\Log
::
getInstance
()
->
write
(
json_encode
(
$this
->
result
),
'/data/log/apptest'
);
if
(
$this
->
result
[
'return_code'
]
==
"SUCCESS"
&&
$this
->
result
[
'result_code'
]
==
"SUCCESS"
&&
$this
->
result
[
'trade_state'
]
==
"SUCCESS"
){
return
true
;
}
...
...
application/models/Business/Order/OrderService.php
View file @
37e425ea
...
...
@@ -1185,7 +1185,13 @@ class OrderServiceModel extends \Business\AbstractModel
$payResult
=
$wxLitePay
->
getOrderPayResult
(
$paySn
,
$subMchId
);
}
else
{
$wxPay
=
\Payment\WxPay
::
getInstance
();
$payResult
=
$wxPay
->
getOrderPayResult
(
$paySn
);
$storeId
=
$orderList
[
0
][
'store_id'
];
$mchIdArray
=
$storeDao
->
getStoreWxMchId
(
$storeId
);
if
(
$mchIdArray
[
'errorCode'
]
>
0
){
\Error\ErrorModel
::
throwException
(
$mchIdArray
[
'errorCode'
]);
}
$subMchId
=
$mchIdArray
[
'mchId'
];
$payResult
=
$wxPay
->
getOrderPayResult
(
$paySn
,
$subMchId
);
}
\Our\Log
::
getInstance
()
->
write
(
'支付结果'
.
$payResult
,
'/data/log/apptest'
);
if
(
$payResult
){
...
...
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