youfeng

app/Jobs/ProcessDataJob.php

@@ -23,7 +23,7 @@ class ProcessDataJob implements ShouldQueue
     protected $user;
     protected $type;
 
-    public $timeout = 1800;
+    public $timeout = 200;
 
     public function __construct($data, $user, $type = 1)
     {

app/Model/RevenueCost.php

@@ -31,7 +31,7 @@ class RevenueCost extends UseScopeBaseModel
     public static $field_hkd_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','employee_id_2','employee_id_2_title','payment_amount','profit','order_id'];
     public static $field_hkd_detail = ['order_type','order_number','order_time','employee_id_1','employee_id_1_title','employee_id_2','employee_id_2_title','customer_code','customer_title','product_code','product_title','product_size','unit','price_1','price_1_total','price_2','price_2_total','quantity','price_3','price_3_total','price_4','price_4_total','profit','profit_rate','order_number_upstream','payment_amount','customer_profit_rate','voucher_type'];
     public static $field_hkd_profit_main = ['rc.employee_id_2','rc.employee_id_2_title','rc.payment_amount','employee_index.start_time','employee_index.end_time','employee_index.index','employee_index.id'];
-    public static $field_hkd_salary_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','payment_amount','profit','order_id'];
+    public static $field_hkd_salary_main = ['order_id as id','order_type','order_number','order_time','employee_id_1','employee_id_1_title','payment_amount','profit','order_id','channel_finance'];
 
     public static $voucher_type = [
          45 => "期初应收",

app/Service/StatisticsService.php

@@ -130,6 +130,10 @@ class StatisticsService extends Service
         }
         if(! empty($data['order_number'])) $model->where('order_number', 'LIKE', '%'.$data['order_number'].'%');
         if(! empty($data['employee_id_1_title'])) $model->where('employee_id_1_title', 'LIKE', '%'.$data['employee_id_1_title'].'%');
+        if(! empty($data['channel_finance_array'])) {
+            $array = explode("\n", str_replace(["\r\n", "\r"], "\n", $data['channel_finance_array']));
+            $model->whereIn('channel_finance', $array);
+        }
 
         return [true, $model];
     }
@@ -172,6 +176,7 @@ class StatisticsService extends Service
                 'order_number' => $value['order_number_upstream'],
                 'customer_code' => $value['customer_code'],
                 'customer_title' => $value['customer_title'],
+                'channel_finance' => $value['channel_finance'],
                 'product_code' => $value['product_code'],
                 'product_title' => $value['product_title'],
                 'product_size' => $value['product_size'],

config/header/71.php

@@ -22,6 +22,10 @@ return [
         'key' =>'employee_id_2_title',
         'value' => '上级管理人员',
     ],
+    [
+        'key' =>'channel_finance',
+        'value' => '渠道财务',
+    ],
     [
         'key' =>'payment_amount',
         'value' => '回款金额',