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

修改订单数量统计的错误

Browse Source
This commit is contained in:
luofei 2024-03-20 16:19:30 +08:00
parent 15131252f1
commit 5af33cdc7d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/dao/store/order/StoreGroupOrderDao.php
View File

@ -43,9 +43,9 @@ class StoreGroupOrderDao extends BaseDao
* @author xaboy
* @day 2020/6/11
*/
public function orderNumber($uid = null)
public function orderNumber($uid = null, $saleType = 1)
{
return $this->search(['uid' => $uid,'is_del' => 0,'paid' => 0],0)->count();
return $this->search(['uid' => $uid,'is_del' => 0,'paid' => 0, 'sale_type' => $saleType],0)->count();
}
/**

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

@ -125,7 +125,7 @@ class StoreOrderRepository extends BaseRepository
return $this->payBalance($user, $groupOrder);
}
if ($type === 'merBalance') {
return $this->payBalance($user, $groupOrder);
return $this->payMerBalance($user, $groupOrder);
}
if (in_array($type, ['weixin', 'alipay'], true) && $isApp) {
@ -618,7 +618,9 @@ class StoreOrderRepository extends BaseRepository
*/
public function userOrderNumber(int $uid, $saleType)
{
$noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
/** @var StoreGroupOrderRepository $groupOrderRepo */
$groupOrderRepo = app()->make(StoreGroupOrderRepository::class);
$noPay = $groupOrderRepo->orderNumber($uid, $saleType);
$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();