【智价云】 编辑数据清洗配置更新

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

@@ -126,6 +126,8 @@ class ControlGoods extends Controller
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $ControlGoodsModel->where($map)->first();
@@ -154,6 +156,8 @@ class ControlGoods extends Controller
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
         //查询是否存在
         $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

@@ -127,6 +127,8 @@ class LowPriceGoods extends Controller
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'], 'platform' => $all_data['platform']];
         $data = $LowPriceGoodsModel->where($map)->first();
@@ -155,6 +157,8 @@ class LowPriceGoods extends Controller
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
         //查询是否存在
         $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();

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

@@ -127,6 +127,8 @@ class ViolationProduct extends Controller
         $all_data = request()->all();
         $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
         //查询是否存在
         $map = ['product_name' => $all_data['product_name'], 'product_specs' => $all_data['product_specs'],'platform'=> $all_data['platform']];
         $data = $ViolationProductModel->where($map)->first();
@@ -153,8 +155,10 @@ class ViolationProduct extends Controller
         $id         = request('id', 0);
         // 接收数据
         $all_data = request()->all();
-        $store_scope = request('store_scope','');
+        $store_scope = request('store_scope', '');
         $all_data['store_scope'] = $store_scope;
+        $company_scope = request('company_scope', '');
+        $all_data['company_scope'] = $company_scope;
                 //查询是否存在
         $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();

app/Models/Manager/WashConfig/ControlGoods.php

@@ -63,8 +63,8 @@ class ControlGoods extends Model
                 'platform' => $data['platform'],
                 'product_name' => $data['product_name'],
                 'product_specs' => $data['product_specs'],
-                'store_scope'    => isset($data['store_scope']) && $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
-                'company_scope'    => isset($data['company_scope']) && $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
+                'store_scope'    => $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
+                'company_scope'    => $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'insert_time' => time(),
             ];
             $ControlGoods_id = $this->insertGetId($insert_data);
@@ -110,12 +110,13 @@ class ControlGoods extends Model
             $ControlGoods->platform = $data['platform'];
             $ControlGoods->product_name = $data['product_name'];
             $ControlGoods->product_specs = $data['product_specs'];
-            $ControlGoods->store_scope = $data['store_scope'];
+            $ControlGoods->store_scope = $data['store_scope'] !='' ? 2 : 1; //店铺范围1=全部店铺 2=指定店铺
+            $ControlGoods->company_scope = $data['company_scope'] !='' ? 2 : 1; //公司范围1=全部公司 2=指定公司
             $ControlGoods->update_time = time();
             $ControlGoods->save();
 
             $ControlGoodsCompanyModel->where('control_product_logid', $ControlGoods->id)->delete();
-            if ($data['company_scope'] == 2) {
+            if ($ControlGoods->company_scope == 2) {
                 $insert_company_data = [];
                 $company_scope = explode(',', $data['company_scope']);
                 foreach ($company_scope as $company_id) {

app/Models/Manager/WashConfig/LowPriceGoods.php

@@ -65,8 +65,8 @@ class LowPriceGoods extends Model
                 'product_name' => $data['product_name'],
                 'product_specs' => $data['product_specs'],
                 'suggested_price' => $data['suggested_price'],
-                'store_scope'    => isset($data['store_scope']) && $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
-                'company_scope'    => isset($data['company_scope']) && $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
+                'store_scope'    =>  $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
+                'company_scope'    => $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'insert_time' => time(),
             ];
             $LowProduct_id = $this->insertGetId($insert_data);
@@ -113,13 +113,13 @@ class LowPriceGoods extends Model
             $LowProduct->product_name = $data['product_name'];
             $LowProduct->product_specs = $data['product_specs'];
             $LowProduct->suggested_price = $data['suggested_price'];
-            $LowProduct->store_scope = $data['store_scope'] ? 2 : 1; //店铺范围1=全部店铺 2=指定店铺
-            $LowProduct->company_scope = $data['company_scope'] ? 2 : 1; //公司范围1=全部公司 2=指定公司
+            $LowProduct->store_scope = $data['store_scope'] !='' ? 2 : 1; //店铺范围1=全部店铺 2=指定店铺
+            $LowProduct->company_scope = $data['company_scope'] !='' ? 2 : 1; //公司范围1=全部公司 2=指定公司
             $LowProduct->update_time = time();
             $LowProduct->save();
 
             $LowPriceGoodsCompanyModel->where('lowprice_product_logid', $LowProduct->id)->delete();
-            if ($data['company_scope'] == 2) {
+            if ($LowProduct->company_scop == 2) {
                 $insert_company_data = [];
                 $company_scope = explode(',', $data['company_scope']);
                 foreach ($company_scope as $company_id) {

app/Models/Manager/WashConfig/ViolationProduct.php

@@ -63,8 +63,8 @@ class ViolationProduct extends Model
                 'platform' => $data['platform'],
                 'product_name' => $data['product_name'],
                 'product_specs' => $data['product_specs'],
-                'store_scope'    => isset($data['store_scope']) && $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
-                'company_scope'    => isset($data['company_scope']) && $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
+                'store_scope'    => $data['store_scope'] !='' ? 2 : 1, //店铺范围1=全部店铺 2=指定店铺
+                'company_scope'    => $data['company_scope'] !='' ? 2 : 1, //公司范围1=全部公司 2=指定公司
                 'insert_time' => time(),
             ];
             $ViolationProduct_id = $this->insertGetId($insert_data);
@@ -110,13 +110,13 @@ class ViolationProduct extends Model
             $ViolationProduct->platform = $data['platform'];
             $ViolationProduct->product_name = $data['product_name'];
             $ViolationProduct->product_specs = $data['product_specs'];
-            $ViolationProduct->store_scope = $data['store_scope'];
+            $ViolationProduct->store_scope = $data['store_scope'] !='' ? 2 : 1; //店铺范围1=全部店铺 2=指定店铺
+            $ViolationProduct->company_scope = $data['company_scope'] !='' ? 2 : 1; //公司范围1=全部公司 2=指定公司
             $ViolationProduct->update_time = time();
             $ViolationProduct->save();
-            DB::commit();
 
             $ViolationProductCompanyModel->where('violation_product_logid', $ViolationProduct->id)->delete();
-            if ($data['company_scope'] == 2) {
+            if ($ViolationProduct->company_scope == 2) {
                 $insert_company_data = [];
                 $company_scope = explode(',', $data['company_scope']);
                 foreach ($company_scope as $company_id) {
@@ -127,6 +127,7 @@ class ViolationProduct extends Model
                 }
                 $ViolationProductCompanyModel->insert($insert_company_data);
             }
+            DB::commit();
             return true;
             // 成功处理...
         } catch (\Exception $e) {