edit

app/cash/lib/Order.php

@@ -126,7 +126,7 @@ class Order
     }
     #导出Excel
     public function out_order_api($data){
-        $header = array('ID', '结算单号', '结算门店', '订货单编号', '数量', '结算金额', '结算类型', '入账状态', '审核状态', '支付类型', '结算时间','审核备注','生成时间');
+        $header = array('ID', '结算单号', '结算门店', '订货单编号', '数量', '结算金额', '结算类型', '入账状态', '审核状态', '支付类型', '结算时间','审核备注','生成时间', '礼品卡卡号');
         $body = array();
         foreach($data as $k => $v){
             $type_info = Dever::db('shop/info')->find(array('id'=>$v['type_id']));
@@ -160,6 +160,13 @@ class Order
             if(isset($v['cdate']) && $v['cdate']){
                 $cdate = date('Y-m-d H:i',$v['cdate']);
             }
+            $card_code_card = '';
+            if ($v['pay_type'] == 2) {
+                $sell_order = Dever::db('shop/sell_order')->find($v['source_order_id']);
+                if ($sell_order) {
+                    $card_code_card = $sell_order['card_code_card']."\n";
+                }
+            }
             
             $d = array
             (
@@ -176,6 +183,7 @@ class Order
                 $operdate,
                 $v['desc'],
                 $cdate,
+                $card_code_card,
             );
             $body[] = $d;
         }

service/agent/database/option_account.php

@@ -417,8 +417,8 @@ return array
             'default'   => '',
             'desc'      => '姓名',
             'match'     => 'is_numeric',
-            'update'    => $col ? 'text' : false, 
-            'show'      => 'audit=1', 
+            // 'update'    => $col ? 'text' : false, 
+            // 'show'      => 'audit=1', 
         ),
         'audit_admin'     => array
         (