edit

service/agent/database/dh_order_ps.php

@@ -168,8 +168,7 @@ return array
                 'end' => array('yes-cdate','<='),
                 'state' => 1,
             ),
-            'type' => 'one',
-            
+            'type' => 'all',
             'col' => '*',
         ),
     ),

service/agent/lib/Dhorder.php

@@ -1507,27 +1507,25 @@ class Dhorder
             $d[7] = $dianqi_cash;
             $d[8] = $caipin_cash;
 
+            $w1 = $w;
+            $w1['mid'] = $v['mid'];
+            $dh_order_ps = Dever::db('agent/dh_order_ps')->getDui($w1);
+
+
             foreach ($res[1] as $k1 => $v1) {
                 $d[$i] = 0;
                 if ($goods[$k1]) {
                     if (strstr($v1,'卡')) {
                         $d[$i] = $goods[$k1]['cash']*$goods[$k1]['sell_num'] ? $goods[$k1]['cash']*$goods[$k1]['sell_num'] : 0;
-                    } else {
-                        $w1 = $w;
-                        $w1['mid'] = $v['mid'];
-                        $order_ps = Dever::db('agent/dh_order_ps')->getDui($w1);
-                        if ($order_ps) {
-                            foreach($order_ps as $a => $b) {
-                                if (isset($b['order_id'])) {
-                                    $pc_order = Dever::db('agent/dh_order')->getSellDui(array('id'=>$b['order_id']));
-                                    if($pc_order){
-                                        $d[$i] += $pc_order['num'];
-                                    }
+                    } elseif($type == 1) {
+                        if ($dh_order_ps) {
+                            foreach($dh_order_ps as $a => $b) {
+                                $dh_order_goods = Dever::db('agent/dh_order_goods')->find(array('order_id'=>$b['order_id'], 'goods_id' => $type_id, 'status' => 1));
+                                if($dh_order_goods){
+                                    $d[$i] += $dh_order_goods['num'];
                                 }
                             }
                         }
-                        
-                       
                         // $d[$i] = $goods[$k1]['sell_num'] ? $goods[$k1]['sell_num'] : 0;
                     }
                 }