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
b6ad0ba6
Commit
b6ad0ba6
authored
Nov 18, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送时间问题
parent
07ad3526
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
5 deletions
+2
-5
DeliveryFormula.php
application/models/DAO/DeliveryFormula.php
+2
-5
No files found.
application/models/DAO/DeliveryFormula.php
View file @
b6ad0ba6
...
...
@@ -83,7 +83,6 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
}
$return
=
array
();
$todayUnixTime
=
mktime
(
0
,
0
,
0
,
date
(
'm'
),
date
(
'd'
),
date
(
'Y'
));
\Our\Log
::
getInstance
()
->
write
(
$todayUnixTime
,
'/data/log/applog'
);
$todayList
=
$this
->
getBuyerFormulaList
(
$currentTime
,
$todayEndTime
,
\Our\ApiConst
::
one
);
$isDefault
=
\Our\ApiConst
::
zero
;
if
(
$todayList
){
...
...
@@ -103,12 +102,10 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
}
$nextStartTime
=
$todayStartTime
+
\Our\ApiConst
::
oneDaySecond
*
2
;
$nextEndTime
=
$todayEndTime
+
\Our\ApiConst
::
oneDaySecond
*
2
;
if
(
$nextEndTime
>
$todayUnixTime
*
3
){
$nextEndTime
=
$todayUnixTime
*
3
;
if
(
$nextEndTime
>
(
$todayUnixTime
+
\Our\ApiConst
::
oneDaySecond
*
3
)
){
$nextEndTime
=
(
$todayUnixTime
+
\Our\ApiConst
::
oneDaySecond
*
3
)
;
}
\Our\Log
::
getInstance
()
->
write
(
$nextStartTime
,
'/data/log/applog'
);
\Our\Log
::
getInstance
()
->
write
(
$nextEndTime
,
'/data/log/applog'
);
$nextList
=
$this
->
getBuyerFormulaList
(
$nextStartTime
,
$nextEndTime
,
$isDefault
);
if
(
$nextList
){
$return
=
array_merge
(
$return
,
$nextList
);
...
...
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