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
29c2226b
Commit
29c2226b
authored
Dec 25, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
??
parent
865dadc7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+1
-0
Pay.php
application/library/Payment/Pay.php
+5
-1
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
29c2226b
...
@@ -522,6 +522,7 @@ class OrderConfirmUtil {
...
@@ -522,6 +522,7 @@ class OrderConfirmUtil {
$order
[
'buyer_email'
]
=
$this
->
address
[
'mob_phone'
];
$order
[
'buyer_email'
]
=
$this
->
address
[
'mob_phone'
];
}
}
}
}
$order
[
'form_id'
]
=
$storeCartData
[
'formId'
]
?
$storeCartData
[
'formId'
]
:
''
;
$order
[
'add_time'
]
=
TIMESTAMP
;
$order
[
'add_time'
]
=
TIMESTAMP
;
$order
[
'payment_type'
]
=
$storeCarts
[
'payway'
];
$order
[
'payment_type'
]
=
$storeCarts
[
'payway'
];
$order
[
'order_amount'
]
=
$storeCarts
[
'orderAmount'
];
$order
[
'order_amount'
]
=
$storeCarts
[
'orderAmount'
];
...
...
application/library/Payment/Pay.php
View file @
29c2226b
...
@@ -45,6 +45,10 @@ class Pay {
...
@@ -45,6 +45,10 @@ class Pay {
$orderInfo
[
'openid'
]
=
$authInfo
[
'openid'
];
$orderInfo
[
'openid'
]
=
$authInfo
[
'openid'
];
$wxLitePay
=
WxLitePay
::
getInstance
();
$wxLitePay
=
WxLitePay
::
getInstance
();
$return
=
$wxLitePay
->
doPay
(
$orderInfo
);
$return
=
$wxLitePay
->
doPay
(
$orderInfo
);
$prepayId
=
$wxLitePay
->
getPrepayId
();
if
(
$prepayId
)
{
\DAO\Order\OrderModel
::
getInstance
()
->
update
(
array
(
'pay_sn'
=>
$data
[
'paySn'
]),
array
(
'prepay_id'
=>
$prepayId
));
}
}
else
if
(
$data
[
'channel'
]
==
\Our\NameConst
::
qqAppChannel
){
}
else
if
(
$data
[
'channel'
]
==
\Our\NameConst
::
qqAppChannel
){
$qPay
=
QPay
::
getInstance
();
$qPay
=
QPay
::
getInstance
();
$return
=
$qPay
->
doPay
(
$orderInfo
);
$return
=
$qPay
->
doPay
(
$orderInfo
);
...
@@ -145,4 +149,4 @@ class Pay {
...
@@ -145,4 +149,4 @@ class Pay {
return
self
::
$_instance
;
return
self
::
$_instance
;
}
}
}
}
\ No newline at end of file
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