|
@@ -182,7 +182,7 @@ class Excel
|
|
|
}
|
|
}
|
|
|
$file = Dever::input('excel_name');
|
|
$file = Dever::input('excel_name');
|
|
|
|
|
|
|
|
- $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '商品支付金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '礼品卡金额', '钱包金额', '优惠券金额', '代理优惠金额', '订单状态', '退款状态', '退款金额');
|
|
|
|
|
|
|
+ $header = array('订单号', '收件人', '收件人手机', '收件人地址', '商品编码', '商品名称', '规格型号', '商品单价', '购买数量', '商品合计金额', '商品支付金额', '下单时间', '付款时间', '发货时间', '收货时间' , '订单总数量', '订单总金额', '订单实付金额', '礼品卡金额', '钱包金额', '优惠券金额', '代理优惠金额', '订单状态', '退款状态', '退款金额','礼品卡名称');
|
|
|
|
|
|
|
|
$table = 'shop/info';
|
|
$table = 'shop/info';
|
|
|
|
|
|
|
@@ -225,6 +225,15 @@ class Excel
|
|
|
if (!$v['refund_cash']) {
|
|
if (!$v['refund_cash']) {
|
|
|
$v['refund_cash'] = 0;
|
|
$v['refund_cash'] = 0;
|
|
|
}
|
|
}
|
|
|
|
|
+ #礼品卡
|
|
|
|
|
+ $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) {
|
|
foreach ($goods as $k1 => $v1) {
|
|
|
|
|
|
|
|
$goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
|
|
$goods_info = Dever::load('goods/lib/info')->getInfoBySku($v1['goods_id'], $v1['sku_id']);
|
|
@@ -285,6 +294,7 @@ class Excel
|
|
|
$status[$v['status']],
|
|
$status[$v['status']],
|
|
|
$refund_status,
|
|
$refund_status,
|
|
|
round($v['refund_cash'], 2),
|
|
round($v['refund_cash'], 2),
|
|
|
|
|
+ $card_name,
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
$body[] = $d;
|
|
$body[] = $d;
|
Your Name