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
44cc27d3
Commit
44cc27d3
authored
Dec 05, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ccw:master_dev
parent
46b07a41
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
ApiConst.php
application/library/Our/ApiConst.php
+1
-0
OrderService.php
application/models/Business/Order/OrderService.php
+1
-1
No files found.
application/library/Our/ApiConst.php
View file @
44cc27d3
...
...
@@ -244,6 +244,7 @@ class ApiConst
//待自提
const
oneHandred
=
100
;
const
closeOrder
=
2
;
const
cancelOrderBySelf
=
4
;
//待配送
const
oneHandredOne
=
101
;
...
...
application/models/Business/Order/OrderService.php
View file @
44cc27d3
...
...
@@ -723,7 +723,7 @@ class OrderServiceModel extends \Business\AbstractModel
if
(
!
empty
(
$orders
))
{
foreach
(
$orders
as
$order
)
{
//更新订单信息
$updateData
=
array
(
'order_state'
=>
ApiConst
::
orderStateClose
,
'refund_amount'
=>
$order
[
'orderAmount'
]);
$updateData
=
array
(
'order_state'
=>
ApiConst
::
orderStateClose
,
'refund_amount'
=>
$order
[
'orderAmount'
]
,
'gmt_update'
=>
TIMESTAMP
,
'is_effective'
=>
ApiConst
::
closeOrder
);
$update
=
$orderDao
->
update
(
array
(
'order_id'
=>
$order
[
'orderId'
]),
$updateData
);
if
(
$update
){
if
(
$order
[
'paymentTime'
]
>
ApiConst
::
zero
&&
in_array
(
$order
[
'paymentType'
],
ArrayConst
::
orderPayTypeOnlines
))
{
...
...
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