导出修改

app/model/order/OrderExport.php

@@ -11,6 +11,7 @@
 namespace app\model\order;
 
 use app\model\BaseModel;
+use app\model\store\Store as StoreModel;
 use think\facade\Db;
 
 /**
@@ -369,7 +370,7 @@ class OrderExport extends BaseModel
                 'left'
             ];
 
-            $order_field = 'o.order_no,o.site_name,o.order_name,o.order_from_name,o.order_type_name,o.order_promotion_name,o.out_trade_no,o.out_trade_no_2,o.delivery_code,o.order_status_name,o.pay_status,o.delivery_status,o.refund_status,o.pay_type_name,o.delivery_type_name,o.name,o.mobile,o.telephone,o.full_address,o.buyer_ip,o.buyer_ask_delivery_time,o.buyer_message,o.goods_money,o.delivery_money,o.promotion_money,o.coupon_money,o.order_money,o.adjust_money,o.balance_money,o.pay_money,o.refund_money,o.pay_time,o.delivery_time,o.sign_time,o.finish_time,o.remark,o.goods_num,o.delivery_status_name,o.is_settlement,o.delivery_store_name,o.promotion_type_name,o.address,m.nickname';
+            $order_field = 'o.order_no,o.site_name,o.order_name,o.order_from_name,o.order_type_name,o.order_promotion_name,o.out_trade_no,o.out_trade_no_2,o.delivery_code,o.order_status_name,o.pay_status,o.delivery_status,o.refund_status,o.pay_type_name,o.delivery_type_name,o.name,o.mobile,o.telephone,o.full_address,o.buyer_ip,o.buyer_ask_delivery_time,o.buyer_message,o.goods_money,o.delivery_money,o.promotion_money,o.coupon_money,o.order_money,o.adjust_money,o.balance_money,o.pay_money,o.refund_money,o.pay_time,o.delivery_time,o.sign_time,o.finish_time,o.remark,o.goods_num,o.delivery_status_name,o.is_settlement,o.delivery_store_name,o.store_id,o.promotion_type_name,o.address,m.nickname';
 
             $order_goods_field = 'og.order_goods_id,og.sku_name,og.sku_no,og.is_virtual,og.goods_class_name,og.price,og.cost_price,og.num,og.goods_money,og.cost_money,og.delivery_no,og.refund_no,og.refund_type,og.refund_apply_money,og.refund_reason,og.refund_real_money,og.refund_delivery_name,og.refund_delivery_no,og.refund_time,og.refund_refuse_reason,og.refund_action_time,og.real_goods_money,og.refund_remark,og.refund_delivery_remark,og.refund_address,og.is_refund_stock,og.refund_status_name,fm.form_data';
 
@@ -394,6 +395,7 @@ class OrderExport extends BaseModel
                 $field_value = [];
                 $field_key = [];
                 $field_key_array = [];
+
                 //为了防止部分代码被筛选中替换, 给变量前后两边增加字符串
                 foreach ($field as $k => $v) {
                     $field_value[] = $v;
@@ -401,6 +403,7 @@ class OrderExport extends BaseModel
                     $field_key_array[] = $k;
                 }
                 $first_line = implode(',', $field_value);
+
                 //写入第一行表头
                 fwrite($fp, $first_line . "\n");
 
@@ -408,6 +411,7 @@ class OrderExport extends BaseModel
 
                 $order_table->field($table_field)->chunk(5000, function($item_list) use ($fp, $temp_line, $field_key_array) {
                     //写入导出信息
+//                    dump($item_list);
                     $this->itemExport($item_list, $field_key_array, $temp_line, $fp);
                     unset($item_list);
                 });
@@ -464,6 +468,11 @@ class OrderExport extends BaseModel
                     'order o',
                     'o.order_id = og.order_id',
                     'left'
+                ],
+                [
+                'store s',
+                    'o.store_id = s.id',
+                    'left'
                 ]
             ];
             $order_field = 'o.order_no,o.site_name,o.order_name,o.order_from_name,o.order_type_name,o.order_promotion_name,o.out_trade_no,o.out_trade_no_2,o.delivery_code,o.order_status_name,o.pay_status,o.delivery_status,o.refund_status,o.pay_type_name,o.delivery_type_name,o.name,o.mobile,o.telephone,o.full_address,o.buyer_ip,o.buyer_ask_delivery_time,o.buyer_message,o.goods_money,o.delivery_money,o.promotion_money,o.coupon_money,o.order_money,o.adjust_money,o.balance_money,o.pay_money,o.refund_money,o.pay_time,o.delivery_time,o.sign_time,o.finish_time,o.remark,o.goods_num,o.delivery_status_name,o.is_settlement,o.delivery_store_name,o.promotion_type_name,o.address';
@@ -589,6 +598,12 @@ class OrderExport extends BaseModel
             $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;
             foreach ($item_v as $key => $value) {
                 $value = trim($value);
 
@@ -602,6 +617,7 @@ class OrderExport extends BaseModel
                 $values = str_replace("\r", '', $values);
                 $new_line_value = str_replace("{\$$key}", $values, $new_line_value);
             }
+
             //写入第一行表头
             fwrite($fp, $new_line_value);
             //销毁变量, 防止内存溢出

app/shop/controller/Order.php

@@ -1579,6 +1579,7 @@ class Order extends BaseShop
 
         $order_export_model = new OrderExport();
         $result = $order_export_model->orderGoodsExport($condition, $condition_desc, $this->site_id, $is_verify, $order_label);
+
         return $result;
     }
     /**