修改订单统计查询

This commit is contained in:
luofei 2024-03-15 17:20:51 +08:00
parent 98fe150502
commit 3cb61a8dd4
3 changed files with 9 additions and 7 deletions

View File

@ -600,14 +600,14 @@ class StoreOrderRepository extends BaseRepository
public function userOrderNumber(int $uid, $saleType)
{
$noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
$noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
$all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
$noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
$noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
$done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
$noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
$all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
$noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
$noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
$done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
$refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2], 'sale_type' => $saleType]);
//$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price');
$orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->count();
$orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1])->where('sale_type', $saleType)->count();
return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all');
}

View File

@ -169,7 +169,7 @@ class StoreOrder extends BaseController
*/
public function number()
{
$saleType = $this->request->get('sale_type');
$saleType = $this->request->get('sale_type', 1);
return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid(), $saleType));
}

View File

@ -251,6 +251,8 @@ Route::group('api/', function () {
Route::get('intention/detail/:id', 'api.store.merchant.MerchantIntention/detail');
Route::post('intention/update/:id', 'api.store.merchant.MerchantIntention/update');
Route::post('store/product/group/cancel', 'api.store.product.StoreProductGroup/cancel');
//申请个人交易
Route::post('intention/personal_store', 'api.store.merchant.MerchantIntention/PersonalStore');
Route::get('admin/:merId/expenditure', 'api.server.StoreOrder/expenditure');//商户账单
//管理员申请转账