...
|
...
|
@@ -9,6 +9,7 @@ |
|
|
namespace app\admin\controller;
|
|
|
|
|
|
use app\admin\model\OrderModel;
|
|
|
use app\portal\model\OrderViewModel;
|
|
|
use cmf\controller\AdminBaseController;
|
|
|
use think\Db;
|
|
|
|
...
|
...
|
@@ -140,7 +141,9 @@ class OrderController extends AdminBaseController |
|
|
$where['create_time'] = ['<= time', $endTime];
|
|
|
}
|
|
|
}
|
|
|
$list = $this->singleData('order_view',$where,2,[],10);
|
|
|
$order_view_model = new OrderViewModel();
|
|
|
$list = $order_view_model->where($where)
|
|
|
->paginate(10);
|
|
|
$orderList = $list->items();
|
|
|
foreach ($orderList as $k=>$v) {
|
|
|
$v['options'] = json_decode($v['options'],true);
|
...
|
...
|
@@ -219,7 +222,9 @@ class OrderController extends AdminBaseController |
|
|
$where['create_time'] = ['<= time', $endTime];
|
|
|
}
|
|
|
}
|
|
|
$list = $this->singleData('order_view',$where,2,[],10);
|
|
|
$order_view_model = new OrderViewModel();
|
|
|
$list = $order_view_model->where($where)
|
|
|
->paginate(10);
|
|
|
$orderList = $list->items();
|
|
|
foreach ($orderList as $k=>$v) {
|
|
|
$v['options'] = json_decode($v['options'],true);
|
...
|
...
|
@@ -304,7 +309,9 @@ class OrderController extends AdminBaseController |
|
|
$where['create_time'] = ['<= time', $endTime];
|
|
|
}
|
|
|
}
|
|
|
$list = $this->singleData('order_view',$where,2,[],10);
|
|
|
$order_view_model = new OrderViewModel();
|
|
|
$list = $order_view_model->where($where)
|
|
|
->paginate(10);
|
|
|
$orderList = $list->items();
|
|
|
foreach ($orderList as $k=>$v) {
|
|
|
$v['options'] = json_decode($v['options'],true);
|
...
|
...
|
|