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
2ba8ead1
Commit
2ba8ead1
authored
Nov 18, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送时间问题
parent
57dc9b47
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
DeliveryFormula.php
application/models/DAO/DeliveryFormula.php
+5
-2
No files found.
application/models/DAO/DeliveryFormula.php
View file @
2ba8ead1
...
...
@@ -106,6 +106,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
if
(
$nextEndTime
>
$todayUnixTime
*
3
){
$nextEndTime
=
$todayUnixTime
*
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
);
...
...
@@ -391,8 +394,8 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
$startTime
=
mktime
(
date
(
'H'
,
$beginTime
),
60
,
0
,
date
(
'm'
,
$beginTime
),
date
(
'd'
,
$beginTime
),
date
(
'Y'
,
$beginTime
));
}
}
if
(
$
start
Time
+
\Our\ApiConst
::
halfHour
<
$endTime
){
for
(
$i
=
$
start
Time
;
$i
<
$endTime
;
$i
=
$i
+
(
\Our\ApiConst
::
halfHour
)){
if
(
$
begin
Time
+
\Our\ApiConst
::
halfHour
<
$endTime
){
for
(
$i
=
$
begin
Time
;
$i
<
$endTime
;
$i
=
$i
+
(
\Our\ApiConst
::
halfHour
)){
$temp
=
array
();
$temp
[
'time'
]
=
$i
;
$temp
[
'isDefault'
]
=
$isDefault
;
...
...
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