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
57b3e4f5
Commit
57b3e4f5
authored
Sep 26, 2018
by
wwccw0591
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pc
parent
8c6983e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
ApiConst.php
application/library/Our/ApiConst.php
+2
-0
Order.php
application/models/DAO/Order/Order.php
+8
-2
No files found.
application/library/Our/ApiConst.php
View file @
57b3e4f5
...
...
@@ -14,6 +14,8 @@ class ApiConst
const
tenDaySecond
=
864000
;
//const tenDaySecond = 300;
//一天
const
threeDaySecond
=
259200
;
//一天
const
oneDaySecond
=
86400
;
//半天
const
halfDaySecond
=
43200
;
...
...
application/models/DAO/Order/Order.php
View file @
57b3e4f5
...
...
@@ -616,8 +616,14 @@ class OrderModel extends \DAO\AbstractModel
}
}
$diff
=
TIMESTAMP
-
$order
[
'finnshedTime'
];
if
(
$order
[
'orderState'
]
==
ApiConst
::
orderStateComplete
&&
$diff
<
ApiConst
::
oneDaySecond
)
{
$refundStateName
=
DescribeConst
::
refundRetund
;
if
(
$order
[
'orderState'
]
==
ApiConst
::
orderStateComplete
)
{
if
(
$diff
<
ApiConst
::
oneDaySecond
&&
$order
[
'shippingType'
]
!=
ApiConst
::
express
){
$refundStateName
=
DescribeConst
::
refundRetund
;
}
if
(
$diff
<
ApiConst
::
threeDaySecond
&&
$order
[
'shippingType'
]
==
ApiConst
::
express
){
$refundStateName
=
DescribeConst
::
refundRetund
;
}
}
return
$refundStateName
;
...
...
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