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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
liu 2024-03-15 15:34:21 +08:00
commit 55f98ab3b9
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -592,21 +592,22 @@ class StoreOrderRepository extends BaseRepository
/** /**
* @param int $uid * @param int $uid
* @param $saleType
* @return array * @return array
* @author xaboy * @author xaboy
* @day 2020/6/10 * @day 2020/6/10
*/ */
public function userOrderNumber(int $uid) public function userOrderNumber(int $uid, $saleType)
{ {
$noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid); $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
$noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1])->where('StoreOrder.is_del', 0)->count(); $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])->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])->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])->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])->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();
$refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2]]); $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'); //$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price');
$orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1])->count(); $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->count();
return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all'); return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all');
} }

3
app/controller/api/store/order/StoreOrder.php
View File

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