moonsflyer 8 месяцев назад
Родитель
Сommit
1ecd4d05d5

+ 1 - 1
addon/cashier/shop/controller/Order.php

@@ -402,7 +402,7 @@ class Order extends BaseShop
         }
 
         $order_export_model = new OrderExport();
-
+        outFileLog($order_label,'order','$order_label');
         $result = $order_export_model->orderExport($condition, $condition_desc, $this->site_id, $join ?? null, $is_verify, $order_label);
         return $result;
     }

+ 2 - 2
addon/cashier/shop/view/order/lists.html

@@ -111,7 +111,7 @@
                 <button class="layui-btn" lay-submit id="btn_search"lay-filter="btn_search">筛选</button>
                 <button type="reset" class="layui-btn layui-btn-primary">重置</button>
                 <button class="layui-btn layui-btn-primary" lay-submit lay-filter="batch_export_order_goods" >导出订单商品</button>
-                <button class="layui-btn layui-btn-primary" lay-submit lay-filter="batch_export_order" >导出订单</button>
+                <button class="layui-btn layui-btn-primary" lay-submit lay-filter="batch_export_order" >导出订单1</button>
                 <a class="layui-btn layui-btn-primary" href="{:addon_url('shop/order/export')}" target="_blank">查看导出记录</a>
             </div>
             <input type="hidden" name="status"/>
@@ -341,7 +341,7 @@
                 url: ns.url("shop/order/exportMoneyOrder"),
                 data: data.field,
                 success: function (res) {
-
+                    console.log(2026)
                 }
             });
             window.open(ns.url("shop/order/export",{}));

+ 6 - 1
app/common.php

@@ -1183,7 +1183,12 @@ function periodGroup($srart_time, $end_time, $format = 'Ymd')
     }
     return $data;
 }
-
+/*
+ * 导出数据到日志文件
+ * */
+function outFileLog($data,$filename='log',$title='data'){
+    file_put_contents($_SERVER['DOCUMENT_ROOT'] . '/lic/'.$filename.'.txt', PHP_EOL .date('Y-m-d h:i:s', time()).'~'.$title.':' . json_encode($data,JSON_UNESCAPED_UNICODE), FILE_APPEND);
+}
 
 //解决个别中文乱码
 function mbStrreplace($content, $to_encoding = "UTF-8", $from_encoding = "GBK")

+ 22 - 8
app/model/order/OrderExport.php

@@ -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);
 

+ 1 - 0
app/shop/controller/Order.php

@@ -1424,6 +1424,7 @@ class Order extends BaseShop
         $order_export_model = new OrderExport();
 
         $result = $order_export_model->orderExport($condition, $condition_desc, $this->site_id, $join ?? null, $is_verify, $order_label);
+
         return $result;
     }