|
|
@@ -265,7 +265,7 @@ Class Manage
|
|
|
$paydate,
|
|
|
$operdate,
|
|
|
$fdate,
|
|
|
- $v['num'],
|
|
|
+ $v1['num'],
|
|
|
sprintf('%01.2f',$total_cash),
|
|
|
round($v['price'], 2),
|
|
|
sprintf('%01.2f',$v['card_code_cash']),
|
|
|
@@ -302,14 +302,15 @@ Class Manage
|
|
|
$data[$k]['shop_sid'],
|
|
|
$data[$k]['shop_name'],
|
|
|
$v['order_num'],
|
|
|
- $goods_info['code'] . "\t",
|
|
|
+ $v2['code'] . "\t",
|
|
|
$goods_info['cunhuo_code'] . "\t",
|
|
|
- $goods_info['name'],
|
|
|
+ $v2['name'] . '（'.$goods_info['name'].'）',
|
|
|
$sku,
|
|
|
$goods_info['tax'],
|
|
|
- round($v1['price'], 2),
|
|
|
- round($v1['num'],2),
|
|
|
- round($v1['price']*$v1['num'], 2),
|
|
|
+
|
|
|
+ round($v2['price'], 2),
|
|
|
+ round($v2['num'],2),
|
|
|
+ $p,
|
|
|
$discount_cash,
|
|
|
$price,
|
|
|
$card_code_cash,
|
|
|
@@ -322,19 +323,19 @@ Class Manage
|
|
|
$paydate,
|
|
|
$operdate,
|
|
|
$fdate,
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
+ $v1['num'],
|
|
|
+ sprintf('%01.2f',$total_cash),
|
|
|
+ round($v['price'], 2),
|
|
|
+ sprintf('%01.2f',$v['card_code_cash']),
|
|
|
+ round($v['wallet_cash'], 2),
|
|
|
+ round($v['coupon_cash'], 2),
|
|
|
+ round($v['discount_cash'], 2),
|
|
|
$status[$v['status']],
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
- '',
|
|
|
+ $refund_status,
|
|
|
+ $refund_cdate,
|
|
|
+ round($refund_cash, 2),
|
|
|
+ round($ka,2),
|
|
|
+ round($money,2),
|
|
|
$address_contact,
|
|
|
$address_mobile,
|
|
|
$address_info,
|
Your Name