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
6f7a05cf
Commit
6f7a05cf
authored
Oct 24, 2018
by
liuyuzhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
配送公式修改
parent
99cc6e68
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
DeliveryFormula.php
application/models/DAO/DeliveryFormula.php
+2
-2
No files found.
application/models/DAO/DeliveryFormula.php
View file @
6f7a05cf
...
...
@@ -65,8 +65,8 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
if
(
!
$deliveryFormula
){
return
false
;
}
$deliveryFormula
[
'state'
]
==
\Our\ApiConst
::
one
?
$formula
=
unserialize
(
$deliveryFormula
[
'formula'
])
:
$formula
=
unserialize
(
$deliveryFormula
[
'simple_formula'
]);
$formula
=
unserialize
(
$deliveryFormula
[
'formula'
]);
//
$deliveryFormula['state'] == \Our\ApiConst::one ? $formula = unserialize($deliveryFormula['formula']) : $formula = unserialize($deliveryFormula['simple_formula']);
$formula
=
unserialize
(
$deliveryFormula
[
'
simple_
formula'
]);
ksort
(
$formula
);
foreach
(
$formula
as
$k
=>
$v
){
if
(
$k
*
1000
>=
$distance
){
...
...
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