edit

app/Console/Commands/UpdateBsnNum.php

+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use DB;
+
+class UpdateBsnNum extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'UpdateBsnNum';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = '清空日派单量';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        DB::table("bservisnew")->update(['bs_num'=>0]);
+    }
+}

app/Console/Kernel.php

@@ -24,7 +24,8 @@ class Kernel extends ConsoleKernel
         Commands\GetJdOrderCancel::class,
         Commands\GetJdPurchaseOrder::class,
         Commands\GetJdPurchaseRefund::class,
-        Commands\SynJdPopCancel::class
+        Commands\SynJdPopCancel::class,
+        Commands\UpdateBsnNum::class
     ];
 
     /**
@@ -49,6 +50,7 @@ class Kernel extends ConsoleKernel
         $schedule->command('GetJdOrderCancel')->everyFifteenMinutes();// 抓取京东社会化门店12小时内撤销单 //每十五分钟执行一次
         $schedule->command('GetJdPurchaseOrder')->everyFiveMinutes();//抓取京东供销平台订单 每五分钟执行一次
         $schedule->command('GetJdPurchaseRefund')->everyFiveMinutes();//抓取京东供销平台退款 每五分钟执行一次
+        $schedule->command('UpdateBsnNum')->dailyAt('00:03');//每天0点三分执行一次
     }
 
     /**

app/ExcelTemp/ExcelTemp.php

@@ -922,8 +922,12 @@ trait ExcelTemp
 
                 ['field_name' => '充值/扣款 金额', 'field_value' => 'reo_price'],//
 
+                ['field_name' => '实际 充值/扣款 金额', 'field_value' => 'reo_paid_money'],//
+
                 ['field_name' => '充值/扣款 时间', 'field_value' => 'reo_pay_time'],//
 
+                ['field_name' => '平台名称', 'field_value' => 'pt_name'],
+
                 ['field_name' => '支付方式', 'field_value' => 'reo_pay_way'],//
 
                 ['field_name' => '客户分类', 'field_value' => 'reo_client_type'],//
@@ -931,6 +935,10 @@ trait ExcelTemp
                 ['field_name' => '公司名称', 'field_value' => 'com_name'],//
 
                 ['field_name' => '支付状态', 'field_value' => 'reo_pay_state'],
+
+                ['field_name' => '订单创建时间', 'field_value' => 'order_time'],
+
+                ['field_name' => '是否施工上图', 'field_value' => 'reo_sg'],
             ],
 
             'SerStatisticsDetail'=>[

app/Http/Controllers/ExcelInfo/ExceloutController.php

@@ -2380,6 +2380,12 @@ public function performBserviStore($res,$con='BserviStore'){
             $file = $data['file'];
             if($db){
                 $num1 = count($db);
+                $order_num = array_column($db, 'reo_order_number');
+                $order = DB::table('orders')->whereIn("order_num",$order_num)->select('create_time','order_num','p_id')->get();
+                $order = CommonService::dataToArray($order);
+                $p_id = array_column($order, 'p_id');
+                $pt = DB::table("pt")->whereIn('id',$p_id)->pluck("pt_name",'id');
+                $order = CommonService::jointArrayKey($order, 'order_num');
                 foreach( $db as $k => $v ){
                     if ($v['reo_type'] == 1){
                         $reo_type_name = "充值";
@@ -2430,8 +2436,14 @@ public function performBserviStore($res,$con='BserviStore'){
                             $rs[$k][strtolower(chr(65+$num))] = $reo_type_name;
                         }elseif ($vg == 'reo_price'){
                             $rs[$k][strtolower(chr(65+$num))]  = $v['reo_price'];
+                        }elseif ($vg == 'reo_paid_money'){
+                            if(empty($v['reo_paid_money'])){
+                                $rs[$k][strtolower(chr(65 + $num))] = 0;
+                            }else {
+                                $rs[$k][strtolower(chr(65 + $num))] = $v['reo_paid_money'];
+                            }
                         }elseif ($vg == 'reo_pay_time'){
-                            $rs[$k][strtolower(chr(65+$num))]  = $v['reo_pay_time'];
+                            $rs[$k][strtolower(chr(65 + $num))] = $v['reo_pay_time'];
                         }elseif ($vg == 'reo_pay_way'){
                             $rs[$k][strtolower(chr(65+$num))]  = $reo_pay_way_name;
                         }elseif($vg == 'reo_client_type'){
@@ -2440,6 +2452,16 @@ public function performBserviStore($res,$con='BserviStore'){
                             $rs[$k][strtolower(chr(65+$num))]  = $com_name;
                         }elseif($vg == 'reo_pay_state'){
                             $rs[$k][strtolower(chr(65+$num))]  = $reo_pay_state_name;
+                        }elseif($vg == 'reo_sg'){
+                            if($v['reo_sg']==2) {
+                                $rs[$k][strtolower(chr(65 + $num))] = '已施工';
+                            }else{
+                                $rs[$k][strtolower(chr(65 + $num))] = '未施工';
+                            }
+                        }elseif($vg == 'order_time'){
+                            $rs[$k][strtolower(chr(65+$num))]  = $order[$v['reo_order_number']]['create_time'];
+                        }elseif($vg == 'pt_name'){
+                            $rs[$k][strtolower(chr(65+$num))]  = $pt[$order[$v['reo_order_number']]['p_id']];
                         }
                         // else{
                         //     $rs[$k][strtolower(chr(65+$num))] = "\t".$v[$vg]."\t";

app/Http/Controllers/Service/PayController.php

@@ -92,7 +92,7 @@ class PayController extends BaseController
         //导出 start
         if ($request->input('is_excel') == 1) {
             $excel = new CommonController();
-            return $excel->getExcelOut($request['Pri_id'], $sqls, $request->get('session_token'));
+            return $excel->getExcelOut($request['Pri_id'], $sqls, $request->get('session_token'),400);
         }
         //导出 end
         $all_button = BmmcService::whereButton($request->input('token'),$request->input('Pri_id'));
@@ -226,7 +226,7 @@ class PayController extends BaseController
         $return['reo_create_time'] = $add_data['reo_create_time'];
         $return['good_name'] = '充值'.$request['reo_price'].'元';
         if ($add_res) {
-            $this->insertingLog('充值', $order_number, '公司充值', '充值管理', $request->ip(), $session['admin_acc']);//日志
+            $this->insertingLog('充值', '', '', '充值管理', $request->ip(), $session['admin_acc']);//日志
             DB::commit();
             return response()->json(['Data' => $return, 'ErrorMessage' => '添加成功', 'ErrorCode' => 1]);
         } else {