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
33e9c4e5
Commit
33e9c4e5
authored
Aug 20, 2018
by
zhz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master_dev' of git.shenbd.com:qm-develop/shenbd into master_dev
parents
2a43db51
d512ccfb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
1 deletion
+0
-1
OrderConfirmUtil.php
application/library/Order/OrderConfirmUtil.php
+0
-1
No files found.
application/library/Order/OrderConfirmUtil.php
View file @
33e9c4e5
...
...
@@ -889,7 +889,6 @@ class OrderConfirmUtil {
$updateOrder
[
'order_state'
]
=
\Our\ApiConst
::
orderStateWaitConfirm
;
$updateOrder
[
'is_receive_payment'
]
=
\Our\ApiConst
::
one
;
$updateOrder
[
'payment_time'
]
=
(
isset
(
$data
[
'payment_time'
])
?
strtotime
(
$data
[
'payment_time'
])
:
TIMESTAMP
);
$updateOrder
[
'gmt_update'
]
=
TIMESTAMP
;
$updateOrder
[
'payment_type'
]
=
$this
->
getOrderPaymentType
(
$data
[
'pay_type'
]);
$orderUpdateResult
=
$orderModel
->
update
(
$orderCon
,
$updateOrder
);
if
(
!
$orderUpdateResult
){
...
...
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