Skip to content

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

配送时间问题

parent ddecb4c5
Show 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 {
}
if($return){
$newReturn = array();
foreach($return as $key=>$val){
if(isset($newReturn[$key])){
$newReturn[$key] = array_merge($newReturn[$key],$val);
foreach($return as $val){
$keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
if(isset($newReturn[$keyTemp])){
$newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
}else{
$newReturn[$key]=$val;
$newReturn[$keyTemp]=$val;
}
}
$returnList = array();
......@@ -279,11 +280,12 @@ class DeliveryFormulaModel extends \DAO\AbstractModel {
}
if($return){
$newReturn = array();
foreach($return as $key=>$val){
if(isset($newReturn[$key])){
$newReturn[$key] = array_merge($newReturn[$key],$val);
foreach($return as $val){
$keyTemp= strtotime(date('Y-m-d',$val[0]['time']));
if(isset($newReturn[$keyTemp])){
$newReturn[$keyTemp] = array_merge($newReturn[$keyTemp],$val);
}else{
$newReturn[$key]=$val;
$newReturn[$keyTemp]=$val;
}
}
$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