Commit c6837123 authored by wwccw0591's avatar wwccw0591

test

parent 40221ea7
...@@ -20,9 +20,6 @@ class OrderController extends \Our\Controller_AbstractApi { ...@@ -20,9 +20,6 @@ class OrderController extends \Our\Controller_AbstractApi {
} }
$keyword=$this->req[\Our\NameConst::data]['keyword']?$this->req[\Our\NameConst::data]['keyword']:FAlSE; $keyword=$this->req[\Our\NameConst::data]['keyword']?$this->req[\Our\NameConst::data]['keyword']:FAlSE;
$orders=$orderService->getList($this->memberId,$keyword,$pageIndex,$pageSize,$orderState); $orders=$orderService->getList($this->memberId,$keyword,$pageIndex,$pageSize,$orderState);
if(!empty($keyWord)){
throw new \Exception(json_encode($orders));
}
$this->success($orders); $this->success($orders);
......
...@@ -414,6 +414,9 @@ class OrderServiceModel extends \Business\AbstractModel ...@@ -414,6 +414,9 @@ class OrderServiceModel extends \Business\AbstractModel
} }
$returnData['orders'] = $orderMerge; $returnData['orders'] = $orderMerge;
$returnData['totalCount'] = $orders['totalCount']; $returnData['totalCount'] = $orders['totalCount'];
if(!empty($returnData)){
throw new \Exception(json_encode($returnData));
}
return $returnData; return $returnData;
} else { } else {
return Array( return 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