Commit 04538a31 authored by hj's avatar hj

更新

parent ed803e47
...@@ -74,13 +74,12 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd ...@@ -74,13 +74,12 @@ class RhawnProductRepositoryEloquent extends BaseRepository implements RhawnProd
}else{ }else{
$promotionsModel->where('promotions_products.p_id',$pId); $promotionsModel->where('promotions_products.p_id',$pId);
} }
/*$promotions = $promotionsModel->where('promotions.pt_start','<=',time()) $promotions = $promotionsModel->where('promotions.pt_start','<=',time())
->where('promotions.pt_end','>=',time()) ->where('promotions.pt_end','>=',time())
->get();*/ ->get();
$promotions = $promotionsModel->get(); //$promotions = $promotionsModel->get();
if($promotions){ if($promotions){
$promotions = $promotions->toArray(); return $promotions->toArray();
return $promotions;
} }
return null; return null;
} }
......
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