[智价云] 移除清洗配置中的采集配置

app/Http/Controllers/Manager/WashConfig/ControlGoods.php

@@ -138,13 +138,6 @@ class ControlGoods extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = strtotime($sampling_start_time.'00:00:00');
-        $all_data['sampling_end_time'] = strtotime($sampling_end_time.'23:59:59');
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $ControlGoodsModel->where($map)->first();
@@ -179,13 +172,6 @@ class ControlGoods extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = strtotime($sampling_start_time.'00:00:00');
-        $all_data['sampling_end_time'] = strtotime($sampling_end_time.'23:59:59');
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $ControlGoodsModel->where($map)->where('id', '!=', $id)->first();

app/Http/Controllers/Manager/WashConfig/LowPriceGoods.php

@@ -151,15 +151,6 @@ class LowPriceGoods extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00'):'0';
-        $all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
-        $allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp();// 明天的开始时间（允许开始采集时间校验）
-        if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $LowPriceGoodsModel->where($map)->first();
@@ -199,13 +190,6 @@ class LowPriceGoods extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00'):'0';
-        $all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $LowPriceGoodsModel->where($map)->where('id', '!=', $id)->first();
@@ -215,11 +199,6 @@ class LowPriceGoods extends Controller
         $LowProduct = $LowPriceGoodsModel->where($where)->first();
         if (!$LowProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $LowProduct->toarray();
-        //如果修改采集周期，则校验采集时间是否在明天以后
-        if ($sampling_cycle != $LowProduct->sampling_cycle) {
-            $allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp(); // 明天的开始时间（允许开始采集时间校验）
-            if ($all_data['sampling_start_time'] && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
-        }
         $result =  $LowPriceGoodsModel->editLowProduct_content($LowProduct, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Http/Controllers/Manager/WashConfig/ViolationProduct.php

@@ -151,15 +151,6 @@ class ViolationProduct extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00'):'0';
-        $all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
-        $allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp();// 明天的开始时间（允许开始采集时间校验）
-        if ($all_data['sampling_start_time']  && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $ViolationProductModel->where($map)->first();
@@ -199,13 +190,6 @@ class ViolationProduct extends Controller
         $all_data['category_id'] = $category_id;
         $specify_responsible_person = request('specify_responsible_person', '0');
         $all_data['specify_responsible_person'] = $specify_responsible_person;
-        //采集信息配置
-        $sampling_cycle = request('sampling_cycle', '0');
-        $sampling_start_time = request('sampling_start_time', '');
-        $sampling_end_time = request('sampling_end_time', '');
-        $all_data['sampling_cycle'] = $sampling_cycle;
-        $all_data['sampling_start_time'] = $sampling_start_time ? strtotime($sampling_start_time . '00:00:00'):'0';
-        $all_data['sampling_end_time'] = $sampling_end_time ? strtotime($sampling_end_time . '23:59:59'):'0';
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $ViolationProductModel->where($map)->where('id', '!=', $id)->first();
@@ -215,11 +199,6 @@ class ViolationProduct extends Controller
         $ViolationProduct = $ViolationProductModel->where($where)->first();
         if (!$ViolationProduct) return json_send(['code' => 'error', 'msg' => '记录不存在']);
         $oldData = $ViolationProduct->toarray();
-        //如果修改采集周期，则校验采集时间是否在明天以后
-        if ($sampling_cycle != $ViolationProduct->sampling_cycle) {
-            $allow_sampling_time = Carbon::tomorrow()->startOfDay()->getTimestamp(); // 明天的开始时间（允许开始采集时间校验）
-            if ($all_data['sampling_start_time']  && $all_data['sampling_start_time'] < $allow_sampling_time) return json_send(['code' => 'error', 'msg' => '采集最早开始时间为明天']);
-        }
         $result =  $ViolationProductModel->editViolationProduct_content($ViolationProduct, $all_data);
         // 如果操作失败
         if (!$result)     return json_send(['code' => 'error', 'msg' => '修改失败']);

app/Models/Manager/WashConfig/ControlGoods.php

@@ -42,9 +42,6 @@ class ControlGoods extends Model
             'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
             'category_id' => $data['category_id'],
             'specify_responsible_person' => $data['specify_responsible_person'],
-            'sampling_cycle' => $data['sampling_cycle'],
-            'sampling_start_time' => $data['sampling_start_time'],
-            'sampling_end_time' => $data['sampling_end_time'],
             'insert_time' => time(),
         ];
         $ControlGoods_id = $this->insertGetId($insert_data);
@@ -73,9 +70,6 @@ class ControlGoods extends Model
                 'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'category_id' => $data['category_id'],
                 'specify_responsible_person' => $data['specify_responsible_person'],
-                'sampling_cycle' => $data['sampling_cycle'],
-                'sampling_start_time' => $data['sampling_start_time'],
-                'sampling_end_time' => $data['sampling_end_time'],
                 'insert_time' => time(),
             ];
             $ControlGoods_id = $this->insertGetId($insert_data);
@@ -127,9 +121,6 @@ class ControlGoods extends Model
             $ControlGoods->company_scope = $company_scope;
             $ControlGoods->category_id = $data['category_id'];
             $ControlGoods->specify_responsible_person = $data['specify_responsible_person'];
-            $ControlGoods->sampling_cycle = $data['sampling_cycle'];
-            $ControlGoods->sampling_start_time = $data['sampling_start_time'];
-            $ControlGoods->sampling_end_time = $data['sampling_end_time'];
             $ControlGoods->update_time = time();
             $ControlGoods->save();
 

app/Models/Manager/WashConfig/LowPriceGoods.php

@@ -43,9 +43,6 @@ class LowPriceGoods extends Model
             'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
             'category_id' => $data['category_id'],
             'specify_responsible_person' => $data['specify_responsible_person'],
-            'sampling_cycle' => $data['sampling_cycle'],
-            'sampling_start_time' => $data['sampling_start_time'],
-            'sampling_end_time' => $data['sampling_end_time'],
             'insert_time' => time(),
         ];
         $LowProduct_id = $this->insertGetId($insert_data);
@@ -75,9 +72,6 @@ class LowPriceGoods extends Model
                 'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'category_id' => $data['category_id'],
                 'specify_responsible_person' => $data['specify_responsible_person'],
-                'sampling_cycle' => $data['sampling_cycle'],
-                'sampling_start_time' => $data['sampling_start_time'],
-                'sampling_end_time' => $data['sampling_end_time'],
                 'insert_time' => time(),
             ];
             $LowProduct_id = $this->insertGetId($insert_data);
@@ -127,9 +121,6 @@ class LowPriceGoods extends Model
             $LowProduct->company_scope = $company_scope;
             $LowProduct->category_id = $data['category_id'];
             $LowProduct->specify_responsible_person = $data['specify_responsible_person'];
-            $LowProduct->sampling_cycle = $data['sampling_cycle'];
-            $LowProduct->sampling_start_time = $data['sampling_start_time'];
-            $LowProduct->sampling_end_time = $data['sampling_end_time'];
             $LowProduct->update_time = time();
             $LowProduct->save();
 

app/Models/Manager/WashConfig/ViolationProduct.php

@@ -42,9 +42,6 @@ class ViolationProduct extends Model
             'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
             'category_id' => $data['category_id'],
             'specify_responsible_person' => $data['specify_responsible_person'],
-            'sampling_cycle' => $data['sampling_cycle'],
-            'sampling_start_time' => $data['sampling_start_time'],
-            'sampling_end_time' => $data['sampling_end_time'],
             'insert_time' => time(),
         ];
         $ViolationProduct_id = $this->insertGetId($insert_data);
@@ -73,9 +70,6 @@ class ViolationProduct extends Model
                 'company_scope'    => $data['company_scope'] != '' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'category_id' => $data['category_id'],
                 'specify_responsible_person' => $data['specify_responsible_person'],
-                'sampling_cycle' => $data['sampling_cycle'],
-                'sampling_start_time' => $data['sampling_start_time'],
-                'sampling_end_time' => $data['sampling_end_time'],
                 'insert_time' => time(),
             ];
             $ViolationProduct_id = $this->insertGetId($insert_data);
@@ -123,9 +117,6 @@ class ViolationProduct extends Model
             $ViolationProduct->company_scope = $company_scope;
             $ViolationProduct->category_id = $data['category_id'];
             $ViolationProduct->specify_responsible_person = $data['specify_responsible_person'];
-            $ViolationProduct->sampling_cycle = $data['sampling_cycle'];
-            $ViolationProduct->sampling_start_time = $data['sampling_start_time'];
-            $ViolationProduct->sampling_end_time = $data['sampling_end_time'];
             $ViolationProduct->update_time = time();
             $ViolationProduct->save();