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

service/agent/lib/Dhorder.php

@@ -1160,6 +1160,22 @@ class Dhorder
         return 'ok';
     }
     */
+   public function goodsd_api($id){
+        $name = '';
+        $goods = Dever::db('agent/dh_order_goods')->state(array('order_id'=>$id));
+        foreach($goods as $k1 => $v1){
+            $goods_info[] = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
+        }
+        
+        if(isset($goods_info)){
+            foreach($goods_info as $v2){
+                $goods_name[] = $v2['name'];
+                
+            }
+            $name = implode(',',$goods_name);
+        }
+        return $name;
+   }
    #权益订单导出
     public function out_dhorder_api($data){
         $header = array('订单编号', '会员姓名', '会员等级', '会员手机号', '收货姓名(或自提人)', '联系电话', '收货地址', '商品名称', '商品数量', '商品原价','订单状态','下单时间', '付款时间','完成时间','卖家订单备注','权益发放时间','代理商终审时间');
@@ -1192,7 +1208,21 @@ class Dhorder
                     $zhongshen = date('Y-m-d H:i',$v1['cdate']);
                 }
             }
-            
+            $name = '';
+            if($v['type'] == 1){
+                $name = $this->goodsd_api($v['id']);
+            }elseif($v['type'] == 2){
+                $goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
+                if($goods){
+                    $name = $goods['name'];
+                }
+            }elseif($v['type'] == 3){
+                $goods = Dever::db('setting/prize')->find(array('id'=>$v['type_id']));
+                if($goods){
+                    $name = $goods['name'];
+                }
+            }
+
             $goods_status = Dever::db('agent/dh_order')->config['status'];
             $status = Dever::status($goods_status, $v['status']);
             $d = array
@@ -1204,7 +1234,7 @@ class Dhorder
                 isset($address['contact']) ? $address['contact'] : '',
                 isset($address['mobile']) ? $address['mobile'] : '',
                 (isset($res['address_info']) ? $res['address_info'] : '').(isset($address['house_number']) ? $address['house_number'] : ''),
-                $v['name'],
+                $name,
                 $v['num'],
                 $v['price'],
                 $status,
@@ -1228,23 +1258,6 @@ class Dhorder
         foreach($data as $k => $v){
             $member = Dever::db('agent/member')->find(array('id'=>$v['mid']));
             $role = Dever::db('setting/role')->find(array('id'=>$member['role']));
-            // $price = '';
-            // if($v['type'] == 1){
-            //     $goods = Dever::db('goods/info')->find(array('id'=>$v['type_id']));
-            //     if($goods){
-            //         $price = $goods['price'];
-            //     }
-            // }elseif($v['type'] == 2){
-            //     $goods = Dever::db('card/info')->find(array('id'=>$v['type_id']));
-            //     if($goods){
-            //         $price = $goods['value'];
-            //     }
-            // }elseif($v['type'] == 3){
-            //     $goods = Dever::db('setting/prize')->find(array('id'=>$v['type_id']));
-            //     if($goods){
-            //         $price = $goods['price'];
-            //     }
-            // }
             $d = array
             (
                 $v['name'],