|
@@ -522,9 +522,9 @@ class Manage
|
|
|
$soft_cash = Dever::db('agent/soft_cash')->getSoftNum($where);
|
|
|
$data['num'] = $order + $soft_cash;
|
|
|
|
|
|
- $where['status'] = 4;
|
|
|
+ $where['status'] = '-2,-1,1,2,3';
|
|
|
$order = Dever::db('agent/order')->getSoftNoNum($where);
|
|
|
- $where['status'] = 3;
|
|
|
+ $where['status'] = '1,2';
|
|
|
$soft_cash = Dever::db('agent/soft_cash')->getSoftNoNum($where);
|
|
|
$data['no_num'] = $order + $soft_cash;
|
|
|
|
|
@@ -537,9 +537,9 @@ class Manage
|
|
|
$soft_cash = Dever::db('agent/soft_cash')->getSoftCash($where);
|
|
|
$data['money'] = $order['total'] + $soft_cash['total'];
|
|
|
|
|
|
- $where['status'] = 4;
|
|
|
+ $where['status'] = '-2,-1,1,2,3';
|
|
|
$order = Dever::db('agent/order')->getSoftNoCash($where);
|
|
|
- $where['status'] = 3;
|
|
|
+ $where['status'] = '1,2';
|
|
|
$soft_cash = Dever::db('agent/soft_cash')->getSoftNoCash($where);
|
|
|
$data['no_money'] = $order['total'] + $soft_cash['total'];
|
|
|
|