|
|
@@ -34,6 +34,7 @@ class OrderExport extends BaseModel
|
|
|
'pay_status' => '支付状态',
|
|
|
'delivery_status' => '配送状态',
|
|
|
'pay_type_name' => '支付方式',
|
|
|
+ 'order_goods_number'=>'订单商品数量',
|
|
|
'delivery_type_name' => '配送方式',
|
|
|
'nickname' => '购买人',
|
|
|
'name' => '客户姓名',
|
|
|
@@ -55,6 +56,7 @@ class OrderExport extends BaseModel
|
|
|
'balance_money' => '余额支付金额',
|
|
|
'pay_money' => '抵扣之后应付金额',
|
|
|
'refund_money' => '订单退款金额',
|
|
|
+ 'true_get_money'=>'实际收款',
|
|
|
'pay_time' => '支付时间',
|
|
|
'delivery_time' => '配送时间',
|
|
|
'sign_time' => '签收时间',
|
|
|
@@ -281,7 +283,9 @@ class OrderExport extends BaseModel
|
|
|
$table_field = 'o.*,m.nickname,fm.form_data';
|
|
|
$order_table->field($table_field)->chunk(5000, function($item_list) use ($fp, $temp_line, $field_key_array) {
|
|
|
//写入导出信息
|
|
|
- $this->itemExport($item_list, $field_key_array, $temp_line, $fp);
|
|
|
+// dump($item_list);die;
|
|
|
+ $m = $this->itemExport($item_list, $field_key_array, $temp_line, $fp);
|
|
|
+// dump($m);die;
|
|
|
unset($item_list);
|
|
|
|
|
|
}, 'o.order_id');
|
|
|
@@ -597,13 +601,23 @@ class OrderExport extends BaseModel
|
|
|
$item_v[ 'province_name' ] = !empty($address_arr[ 0 ]) ? $address_arr[ 0 ] : "";
|
|
|
$item_v[ 'city_name' ] = !empty($address_arr[ 1 ]) ? $address_arr[ 1 ] : "";
|
|
|
$item_v[ 'district_name' ] = !empty($address_arr[ 2 ]) ? $address_arr[ 2 ] : "";
|
|
|
-
|
|
|
- $store_info = Db::name('store')->where('store_id = '.$item_v['store_id'])->find() ;
|
|
|
- $store_name = '';
|
|
|
- if($store_info){
|
|
|
- $store_name = $store_info['store_name'];
|
|
|
- }
|
|
|
- $item_v['delivery_store_name'] = $store_name;
|
|
|
+
|
|
|
+ if(isset($item_v['store_id'])){
|
|
|
+ $store_info = Db::name('store')->where('store_id = '.$item_v['store_id'])->find() ;
|
|
|
+ $store_name = '';
|
|
|
+ if($store_info){
|
|
|
+ $store_name = $store_info['store_name'];
|
|
|
+ }
|
|
|
+ $item_v['delivery_store_name'] = $store_name;
|
|
|
+ $item_v['site_name'] = $store_name;
|
|
|
+ }
|
|
|
+
|
|
|
+ $ogwhere['order_id'] = $item_v['order_id'];
|
|
|
+ $order_goods_number = Db::name('order_goods')->where($ogwhere)->count('num');
|
|
|
+
|
|
|
+ $item_v['order_goods_number'] = $order_goods_number;
|
|
|
+ //true_get_money = goods_money - promotion_money -refund_money
|
|
|
+ $item_v['true_get_money'] = $item_v['goods_money'] - $item_v['promotion_money'] - $item_v['refund_money'];
|
|
|
foreach ($item_v as $key => $value) {
|
|
|
$value = trim($value);
|
|
|
|