Skip to content

M
my-yaf-project
Commit 57dc9b47 authored by liuyuzhen's avatar liuyuzhen
Browse files
Options

配送时间问题

parent ddecb4c5
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 8 deletions
application/models/DAO/DeliveryFormula.php
View file @ 57dc9b47
...@@ -112,11 +112,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel { ...@@ -112,11 +112,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
} }
if($return){ if($return){
$newReturn = array(); $newReturn = array();
foreach($return as $key=>$val){ foreach($return as $val){
if(isset($newReturn[$key])){ $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
$newReturn[$key] = array_merge($newReturn[$key],$val); if(isset($newReturn[$keyTemp])){
$newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
}else{ }else{
$newReturn[$key]=$val; $newReturn[$keyTemp]=$val;
} }
} }
$returnList = array(); $returnList = array();
...@@ -279,11 +280,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel { ...@@ -279,11 +280,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
} }
if($return){ if($return){
$newReturn = array(); $newReturn = array();
foreach($return as $key=>$val){ foreach($return as $val){
if(isset($newReturn[$key])){ $keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
$newReturn[$key] = array_merge($newReturn[$key],$val); if(isset($newReturn[$keyTemp])){
$newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
}else{ }else{
$newReturn[$key]=$val; $newReturn[$keyTemp]=$val;
} }
} }
$returnList = array(); $returnList = array();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment