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

更新修复退款订单数异常

Browse Source
This commit is contained in:
yaooo 2023-08-24 16:09:40 +08:00
parent 4090218232
commit bbb7f82987
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/dao/system/merchant/FinancialRecordDao.php
View File

@ -112,9 +112,8 @@ class FinancialRecordDao extends BaseDao
} else { } else {
$query->whereMonth('create_time',$date); $query->whereMonth('create_time',$date);
} }
$count = $query->group('order_id')->where('number', '<>', 0)->count();
$count = $query->group('order_id')->count(); $number = $query->where('number', '<>', 0)->sum('number');
$number = $query->sum('number');
return [$count,$number]; return [$count,$number];
} }

1
app/common/repositories/system/merchant/FinancialRecordRepository.php
View File

@ -465,6 +465,7 @@ class FinancialRecordRepository extends BaseRepository
$date = ($type == 1) ? date('Y-m-d', $date_) : date('Y-m', $date_); $date = ($type == 1) ? date('Y-m-d', $date_) : date('Y-m', $date_);
$income = $this->countIncome($type, $where, $date,$merchant); $income = $this->countIncome($type, $where, $date,$merchant);
$expend = $this->countExpend($type, $where, $date,$merchant); $expend = $this->countExpend($type, $where, $date,$merchant);
$data['e'] = $expend;
$charge = bcsub($income['number'], $expend['number'], 2); $charge = bcsub($income['number'], $expend['number'], 2);
$data['date'] = $date; $data['date'] = $date;