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

app/shop/src/Excel.php

@@ -14,7 +14,7 @@ class Excel
         }
         $file = Dever::input('excel_name');
 
-        $header = array('门店编号', '门店名称', '门店类型', '订单号', '购买人', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '配送类型', '订单类型', '下单时间', '付款时间', '发货时间', '订单合计金额', '订单实付金额', '已退订单金额', '支付渠道', '订单状态');
+        $header = array('门店编号', '门店名称', '门店类型', '订单号', '购买人', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '配送类型', '订单类型', '下单时间', '付款时间', '发货时间', '订单合计金额', '订单实付金额', '已退订单金额', '支付渠道', '订单状态','礼品卡名称');
 
         $table = 'shop/info';
 
@@ -40,6 +40,16 @@ class Excel
             $v['refund_cash'] = $v['refund_cash'] ? $v['refund_cash'] : 0;
             
             $user = Dever::load("shop/lib/manage.user", $v['id']);
+            #礼品卡
+            $card_name= '';
+            $code = Dever::db('card/code')->find(array('id'=>$v['card_code_id']));
+            if(isset($code) && $code && $code['card_id']){
+                $card = Dever::db('card/info')->find(array('id'=>$code['card_id']));
+                if(isset($card) && $card && $card['name']){
+                    $card_name = $card['name'];
+                }
+            }
+            
             foreach ($goods as $k1 => $v1) {
 
                 $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
@@ -87,6 +97,7 @@ class Excel
                     $v['refund_cash'],
                     $pay_type[$v['pay_type']],
                     $status[$v['status']],
+                    $card_name,
                 );
 
                 $body[] = $d;
@@ -129,6 +140,7 @@ class Excel
                             '',
                             $pay_type[$v['pay_type']],
                             $status[$v['status']],
+                            $card_name,
                         );
 
                         $body[] = $d;