edit

app/shop/lib/Sell.php

@@ -1419,7 +1419,7 @@ class Sell
             $opertime = '';
         }
 
-        if ($info['fdate']) {
+        if ($info['fdate'] && $info['fdate'] > 0) {
             $fdate = date('Y-m-d H:i', $info['fdate']);
         } else {
             $fdate = '';

app/shop/src/Excel.php

@@ -160,7 +160,7 @@ class Excel
         }
         $file = Dever::input('excel_name');
 
-        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '订单状态', '退款状态', '退款金额');
+        $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '商品支付金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '订单状态', '退款状态', '退款金额');
 
         $table = 'shop/info';
 
@@ -184,12 +184,17 @@ class Excel
             $cdate = strstr($v['cdate'], '-') ? $v['cdate'] : date('Y-m-d H:i', $v['cdate']);
             $paydate = isset($v['paydate']) && $v['paydate'] ? date('Y-m-d H:i', $v['paydate']) : '-';
             $operdate = ($ps && $ps['cdate']) ? date('Y-m-d H:i', $ps['cdate']) : '-';
-            $fdate = $v['fdate'] ? '-' : date('Y-m-d H:i', $v['fdate']);
+            if ($v['fdate']) {
+                $fdate = strstr($v['fdate'], '-') ? $v['fdate'] : date('Y-m-d H:i', $v['fdate']);
+            } else {
+                $fdate = '-';
+            }
             
             $refund_status = Dever::load("shop/lib/manage.buyInfoRefundStatus", $v['id'], 'sell_order');
             $total_cash = Dever::load("shop/lib/manage.getTotalCash", $v['id']);
             $v['refund_cash'] = $v['refund_cash'] ? $v['refund_cash'] : 0;
             $address = Dever::load('passport/address')->getOne($v['uid'], $v['address_id']);
+
             foreach ($goods as $k1 => $v1) {
 
                 $goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
@@ -209,6 +214,12 @@ class Excel
                     $refund_status = '未退款';
                 }
 
+                if ($k1 == 0) {
+                    $goods_price = $v['price'];
+                } else {
+                    $goods_price = 0;
+                }
+
                 $d = array
                 (
                     $v['order_num'],
@@ -223,6 +234,7 @@ class Excel
                     $v1['price'],
                     $v1['num'],
                     $v1['price']*$v1['num'],
+                    $goods_price,
 
                     $cdate,
                     $paydate,
@@ -241,7 +253,7 @@ class Excel
 
                 if ($goods_info['price_type'] > 2 && isset($goods_info['goods']) && is_array($goods_info['goods'])) {
                     
-                    foreach ($goods_info['goods'] as $v2) {
+                    foreach ($goods_info['goods'] as $k2 => $v2) {
                         if ($v2['code']) {
                             //$v2['code'] = '-' . $v2['code'];
                         }
@@ -249,6 +261,11 @@ class Excel
                         if (is_numeric($v2['num']) && is_numeric($v2['price'])) {
                             $p = $v2['price']*$v2['num'];
                         }
+                        if ($k1 == 0) {
+                            $goods_price1 = $v['price'];
+                        } else {
+                            $goods_price1 = 0;
+                        }
                         $d = array
                         (
                             $v['order_num'],
@@ -263,6 +280,7 @@ class Excel
                             $v2['price'],
                             $v2['num'],
                             $p,
+                            $goods_price1,
 
                             $cdate,
                             $paydate,