Merge branch 'master' of ssh://git.dever.cc:10022/dever-product/churen

service/agent/database/member_goods.php

@@ -492,6 +492,8 @@ return array
             (
                 'start' => array('yes-cdate','>='),
                 'end' => array('yes-cdate','<='),
+                'fstart' => array('yes-cdate','>='),
+                'fend' => array('yes-cdate','<='),
                 'mid' => 'yes',
                 'type' => array('yes','in'),
                 'type_id' => 'yes',

service/agent/lib/Dhorder.php

@@ -1390,7 +1390,7 @@ class Dhorder
         if ($pg == 1) {
             $body[] = array('代理商姓名', '角色', '电话', '区域','应收合计', '代理费', '产品费（商品）', '产品费（电器卡）','产品费（菜卡）');
         }
-        
+        // print_R($res[0]);die;
         $i = 0;
         foreach ($res[0] as $k => $v) {
             if ($i == 0) {
@@ -1513,8 +1513,14 @@ class Dhorder
 
 
             foreach ($res[1] as $k1 => $v1) {
+
                 $d[$i] = 0;
                 list($type, $type_id) = explode('_', $k1);
+                $n = $w;
+                $n['mid'] = $v['mid'];
+                $n['type'] = $type;
+                $n['type_id'] = $type_id;
+                $goods[$k1] = Dever::db('agent/member_goods')->getTotal($n);
                 if ($goods[$k1]) {
                     if ($type == 2 && strstr($v1,'卡')) {
                         $d[$i] = $goods[$k1]['cash']*$goods[$k1]['sell_num'] ? $goods[$k1]['cash']*$goods[$k1]['sell_num'] : 0;