edit

app/cash/lib/Set.php

@@ -437,6 +437,8 @@ class Set
             '完成日期',
             '结算日期',
             '对账金额',
+            '礼品卡卡号',
+            '礼品卡抵扣金额',
         );
         if ($type == 'store') {
             $head[6] = '商品数量';
@@ -455,6 +457,15 @@ class Set
                 } else {
                     $cash = '￥' . round($v['cash'], 2);
                 }
+                $card_code_card = '';
+                $card_code_cash = '';
+                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'];
+                        $card_code_cash = $sell_order['card_code_cash'];
+                    }
+                }
 
                 $jstype = Dever::db('cash/order')->config['config_jstype'][$v['jstype']];
                 $body[$k][0] = $v['order_num'];
@@ -467,6 +478,8 @@ class Set
                 if ($type == 'store') {
                     $body[$k][6] = $v['num'];
                 }
+                $body[$k][7] = $card_code_card;
+                $body[$k][8] = $card_code_cash;
                 $body[$k][] = '已入账';
             }
         }