|
@@ -68,7 +68,7 @@ class Excel
|
|
|
$v['order_num'],
|
|
|
$user,
|
|
|
|
|
|
- "'" . $goods_info['code'],
|
|
|
+ $goods_info['code'],
|
|
|
$goods_info['name'],
|
|
|
$sku,
|
|
|
$v1['price'],
|
|
@@ -95,7 +95,7 @@ class Excel
|
|
|
|
|
|
foreach ($goods_info['goods'] as $v2) {
|
|
|
if ($v2['code']) {
|
|
|
- $v2['code'] = '-' . $v2['code'];
|
|
|
+
|
|
|
}
|
|
|
$d = array
|
|
|
(
|
|
@@ -106,7 +106,7 @@ class Excel
|
|
|
$v['order_num'],
|
|
|
$user,
|
|
|
|
|
|
- $goods_info['code'] . $v2['code'],
|
|
|
+ $v2['code'],
|
|
|
$v2['name'] . '('.$goods_info['name'].')',
|
|
|
$sku,
|
|
|
$v2['price'],
|
|
@@ -220,6 +220,43 @@ class Excel
|
|
|
);
|
|
|
|
|
|
$body[] = $d;
|
|
|
+
|
|
|
+ if ($goods_info['price_type'] > 2 && isset($goods_info['goods']) && is_array($goods_info['goods'])) {
|
|
|
+
|
|
|
+ foreach ($goods_info['goods'] as $v2) {
|
|
|
+ if ($v2['code']) {
|
|
|
+
|
|
|
+ }
|
|
|
+ $d = array
|
|
|
+ (
|
|
|
+ $v['order_num'],
|
|
|
+ isset($address['contact']) ? $address['contact'] : '',
|
|
|
+ isset($address['mobile']) ? $address['mobile'] : '',
|
|
|
+ isset($address['address_info']) ? $address['address_info'] : '',
|
|
|
+
|
|
|
+
|
|
|
+ $v2['code'],
|
|
|
+ $v2['name'],
|
|
|
+ $sku,
|
|
|
+ $v2['price'],
|
|
|
+ $v2['num'],
|
|
|
+ $v2['price']*$v2['num'],
|
|
|
+
|
|
|
+ $cdate,
|
|
|
+ $paydate,
|
|
|
+ $operdate,
|
|
|
+
|
|
|
+ '-',
|
|
|
+ '-',
|
|
|
+ '-',
|
|
|
+ $status[$v['status']],
|
|
|
+ '-',
|
|
|
+ '-',
|
|
|
+ );
|
|
|
+
|
|
|
+ $body[] = $d;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|