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
cf62bff3
Commit
cf62bff3
authored
Dec 26, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
upd
parent
189934ac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
PathConst.php
application/library/Our/PathConst.php
+1
-2
Pay.php
application/library/Payment/Pay.php
+3
-1
No files found.
application/library/Our/PathConst.php
View file @
cf62bff3
...
...
@@ -53,8 +53,7 @@ class PathConst {
const
storeStatTime
=
"/storeStat.conf"
;
const
orderCancelTime
=
"/orderCancelTime.conf"
;
const
ktestTime
=
"/ktestTime.conf"
;
//const favoritesStoreFavTimeConf="favoritesStoreFavTime.conf";
...
...
application/library/Payment/Pay.php
View file @
cf62bff3
...
...
@@ -46,7 +46,9 @@ class Pay {
$wxLitePay
=
WxLitePay
::
getInstance
();
$return
=
$wxLitePay
->
doPay
(
$orderInfo
);
$prepayId
=
$wxLitePay
->
getPrepayId
();
file_put_contents
(
$this
->
baseDir
.
\Our\PathConst
::
ktestTime
,
$prepayId
.
'|'
.
$orderInfo
[
'paySn'
]
);
if
(
$prepayId
)
{
$dbName
=
\Our\DbNameConst
::
masterDBConnectName
;
\DAO\Order\OrderModel
::
getInstance
(
$dbName
)
->
update
(
array
(
'pay_sn'
=>
$orderInfo
[
'paySn'
]),
array
(
'prepay_id'
=>
$prepayId
));
}
...
...
@@ -92,7 +94,7 @@ class Pay {
$orderInfo
[
'orderAmount'
]
=
$this
->
orderAmount
;
if
(
$this
->
channel
==
\Our\NameConst
::
wxLiteChannel
){
$orderConfirmUtil
=
\Order\OrderConfirmUtil
::
getInstance
();
$newPaySn
=
$orderConfirmUtil
->
makeNewPaySnForOrderWithOldPaySn
(
$this
->
paySn
,
$this
->
memberId
);
$newPaySn
=
$orderConfirmUtil
->
makeNewPaySnForOrderWithOldPaySn
(
$this
->
paySn
,
$this
->
memberId
);
$this
->
paySn
=
$newPaySn
;
}
$orderInfo
[
'paySn'
]
=
$this
->
paySn
;
...
...
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