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
91cae03a
Commit
91cae03a
authored
Sep 21, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送时间
parent
1780708a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
DeliveryFormula.php
application/models/DAO/DeliveryFormula.php
+2
-1
No files found.
application/models/DAO/DeliveryFormula.php
View file @
91cae03a
...
...
@@ -149,8 +149,9 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
break
;
}
}
$expriseStartTime
+=
$deliveryIntval
*
\Our\ApiConst
::
oneMinute
;
if
(
$expriseStartTime
<
$todayEndTime
){
$expriseData
=
$this
->
getTomorrowFormulaList
(
$expriseStartTime
+
$deliveryIntval
*
\Our\ApiConst
::
oneMinute
,
$todayEndTime
,
$deliveryIntval
*
\Our\ApiConst
::
oneMinute
,
$minFee
,
$myCurrentStartTime
);
$expriseData
=
$this
->
getTomorrowFormulaList
(
$expriseStartTime
,
$todayEndTime
,
$deliveryIntval
*
\Our\ApiConst
::
oneMinute
,
$minFee
,
$myCurrentStartTime
);
if
(
$expriseData
){
$returnData
=
array_merge
(
$expriseData
,
$returnData
);
}
...
...
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