mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 数据之眼-订单-退款单列表

Browse Source
This commit is contained in:
chenbo 2023-12-07 14:53:15 +08:00
parent c0407b656e
commit ac19a12b81
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/controller/api/dataview/Order.php
View File

@ -2,8 +2,10 @@
namespace app\controller\api\dataview; namespace app\controller\api\dataview;
use app\common\dao\store\order\StoreOrderDao;
use app\common\repositories\BaseRepository; use app\common\repositories\BaseRepository;
use app\common\repositories\store\order\StoreOrderRepository; use app\common\repositories\store\order\StoreOrderRepository;
use app\common\repositories\store\order\StoreRefundOrderRepository;
use crmeb\basic\BaseController; use crmeb\basic\BaseController;
use think\App; use think\App;
use think\exception\ValidateException; use think\exception\ValidateException;
@ -458,12 +460,16 @@ class Order extends BaseController
// 订单列表 // 订单列表
public function orderList(StoreOrderRepository $repository) public function orderList(StoreOrderRepository $repository, StoreOrderDao $dao)
{ {
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where = $this->request->params(['date','order_sn','order_type','keywords','username','mer_id','activity_type','group_order_sn','store_name']); $where = $this->request->params(['type', 'date', 'mer_id','keywords','status','username','order_sn','is_trader','activity_type','group_order_sn','store_name']);
$where['reconciliation_type'] = $this->request->param('status', 1); $status = $where['status'];
return app('json')->success($repository->adminMerGetList($where, $page, $limit)); unset($where['status']);
$query = $dao->search($where, null)->where($repository->getOrderType($status));
$count = $query->count();
$list = $query->page($page, $limit)->select();
return app('json')->success(compact('count', 'list'));
} }
// 订单列表统计标题 // 订单列表统计标题
@ -476,5 +482,14 @@ class Order extends BaseController
return app('json')->success($data); return app('json')->success($data);
} }
// 退款订单列表
public function refundOrderList(StoreRefundOrderRepository $repository)
{
[$page,$limit] = $this->getPage();
$where = $this->request->params(['refund_order_sn','status','refund_type','date','mer_id','order_sn','is_trader']);
$list = $repository->getAllList($where, $page, $limit);
unset($list['stat']);
return app('json')->success($list);
}
} }

1
route/api.php
View File

@ -738,6 +738,7 @@ Route::group('api/', function () {
Route::get('curr_day_order_amount', 'Order/currDayOrderAmount'); Route::get('curr_day_order_amount', 'Order/currDayOrderAmount');
Route::get('order_list', 'Order/orderList'); Route::get('order_list', 'Order/orderList');
Route::get('order_list_count_title', 'Order/orderCountTitle'); Route::get('order_list_count_title', 'Order/orderCountTitle');
Route::get('refund_order_list', 'Order/refundOrderList');
// api.dataview.User // api.dataview.User
Route::get('user_merchat_count', 'User/userMerchantCount'); Route::get('user_merchat_count', 'User/userMerchantCount');