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];
} }

5
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;
@ -634,7 +635,7 @@ class FinancialRecordRepository extends BaseRepository
$financialType = ['brokerage_one', 'brokerage_two']; $financialType = ['brokerage_one', 'brokerage_two'];
[$data['count_brokerage'], $data['number_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType); [$data['count_brokerage'], $data['number_brokerage']] = $this->dao->getDataByType($type, $where, $date, $financialType);
// 退回 手续费 // 退回手续费
$financialType = ['refund_charge']; $financialType = ['refund_charge'];
[$data['count_charge'], $data['number_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType); [$data['count_charge'], $data['number_charge']] = $this->dao->getDataByType($type, $where, $date, $financialType);
@ -665,7 +666,7 @@ class FinancialRecordRepository extends BaseRepository
$commission=['commission_to_town','commission_to_village','commission_to_service_team','commission_to_cloud_warehouse','commission_to_entry_merchant']; $commission=['commission_to_town','commission_to_village','commission_to_service_team','commission_to_cloud_warehouse','commission_to_entry_merchant'];
} }
if ($where['is_mer']) { //商户的 if ($where['is_mer']) { //商户的
//退回 收入 //退回收入
$financialType = ['refund_order']; $financialType = ['refund_order'];
[$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType); [$data['count_refund'], $data['number_refund']] = $this->dao->getDataByType($type, $where, $date, $financialType);