|
@@ -53,16 +53,21 @@ class refill_evidenceControl extends SystemControl
|
|
|
$evidence_list = $this->formatData($evidence_list);
|
|
|
|
|
|
$counts = Model('')->table('refill_evidence')
|
|
|
- ->field('sum(amount) as amounts,status')
|
|
|
+ ->field('sum(amount) as amounts,status,add_type')
|
|
|
->where($condition)
|
|
|
- ->group('status')
|
|
|
+ ->group('status,add_type')
|
|
|
->select();
|
|
|
- $success_amount = $send_amount = $cancel_amount = 0;
|
|
|
+ $success_amount = $send_amount = $cancel_amount = $mch_amount = $system_amount = 0;
|
|
|
foreach ($counts as $count) {
|
|
|
if($count['status'] == 1) {
|
|
|
$send_amount += $count['amounts'];
|
|
|
}elseif ($count['status'] == 2) {
|
|
|
$success_amount += $count['amounts'];
|
|
|
+ if($count['add_type'] == 1) {
|
|
|
+ $mch_amount += $count['amounts'];
|
|
|
+ }elseif ($count['add_type'] == 2) {
|
|
|
+ $system_amount += $count['amounts'];
|
|
|
+ }
|
|
|
}elseif ($count['status'] == 3) {
|
|
|
$cancel_amount += $count['amounts'];
|
|
|
}
|
|
@@ -70,6 +75,8 @@ class refill_evidenceControl extends SystemControl
|
|
|
$stats['send_amount'] = $send_amount;
|
|
|
$stats['success_amount'] = $success_amount;
|
|
|
$stats['cancel_amount'] = $cancel_amount;
|
|
|
+ $stats['mch_amount'] = $mch_amount;
|
|
|
+ $stats['system_amount'] = $system_amount;
|
|
|
if(!empty($export)) {
|
|
|
$result['data'] = $evidence_list;
|
|
|
$result['stats'] = $stats;
|