Skip to content

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

配送时间问题

parent f7499f51
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 2 deletions
application/models/DAO/DeliveryFormula.php
View file @ ddecb4c5
......@@ -111,8 +111,16 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
$return = array_merge($return,$nextList);
}
if($return){
$newReturn = array();
foreach($return as $key=>$val){
if(isset($newReturn[$key])){
$newReturn[$key] = array_merge($newReturn[$key],$val);
}else{
$newReturn[$key]=$val;
}
}
$returnList = array();
foreach($return as $key=>$value){
foreach($newReturn as $key=>$value){
$dayList = array();
$dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
$dayList['list']= $value;
......@@ -270,8 +278,16 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
$return = array_merge($return,$nextList);
}
if($return){
$newReturn = array();
foreach($return as $key=>$val){
if(isset($newReturn[$key])){
$newReturn[$key] = array_merge($newReturn[$key],$val);
}else{
$newReturn[$key]=$val;
}
}
$returnList = array();
foreach($return as $key=>$value){
foreach($newReturn as $key=>$value){
$dayList = array();
$dayList['time']= strtotime(date('Y-m-d',$value[0]['time']));
$dayList['list']= $value;
......
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