Your Name 2 years ago
parent
commit
cd07c4cb7a

+ 2 - 2
service/agent/database/order.php

@@ -894,7 +894,7 @@ return array
             (
                 'fstart' => array('yes-cdate', '>='),
                 'fend' => array('yes-cdate', '<='),
-                'status' => array('yes', '!='),
+                'status' => array('yes', 'in'),
                 'state' => 1,
             ),
             'type' => 'one',
@@ -923,7 +923,7 @@ return array
                 'fstart' => array('yes-cdate', '>='),
                 'fend' => array('yes-cdate', '<='),
                 'soft_cash' => array('yes', '>='),
-                'status' => array('yes','!='),
+                'status' => array('yes','in'),
                 'state' => 1,
             ),
             'type' => 'count',

+ 2 - 2
service/agent/database/soft_cash.php

@@ -390,7 +390,7 @@ return array
             (
                 'fstart' => array('yes-cdate', '>='),
                 'fend' => array('yes-cdate', '<='),
-                'status' => array('yes', '!='),
+                'status' => array('yes', 'in'),
                 'state' => 1,
             ),
             'type' => 'one',
@@ -416,7 +416,7 @@ return array
             (
                 'fstart' => array('yes-cdate', '>='),
                 'fend' => array('yes-cdate', '<='),
-                'status' => array('yes','!='),
+                'status' => array('yes','in'),
                 'state' => 1,
             ),
             'type' => 'count',

+ 4 - 4
service/mail/lib/Manage.php

@@ -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'];
         #总钱数