Merge branch 'tangyuanwang' into tmp

# Conflicts:
#	app/Http/Controllers/Manager/Process/LowPriceGoods.php

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

@@ -228,15 +228,15 @@ class LowPriceGoods extends Controller
             foreach ($result['data'] as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
+                $first_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
+                $responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid', $value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
+                $source_responsible_person_name = $LowPriceGoodsMemberModel->where('lowprice_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
                 //关闭快照不展示数据
                 if (!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';

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

@@ -222,15 +222,15 @@ class ViolationProduct extends Controller
             foreach ($result['data'] as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
+                $first_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['first_responsible_person_name'] = $first_responsible_person_name;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
+                $responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['responsible_person_name'] = $responsible_person_name;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
+                $source_responsible_person_name = $ViolationProductMemberModel->where('violation_product_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result['data'][$key]['source_responsible_person_name'] = $source_responsible_person_name;
                 //关闭快照不展示数据
                 if(!empty($snapshot_status) && $snapshot_status == 1) $result['data'][$key]['snapshot_url'] = '';

app/Http/Controllers/Manager/Process/ViolationStore.php

@@ -375,15 +375,15 @@ class ViolationStore extends Controller
             foreach ($result as $key => $value) {
                 //查询第一责任人名称
                 $first_responsible_person = explode(',', $value['first_responsible_person']);
-                $first_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
+                $first_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->where('duty_type','1')->whereIn('employee_id', $first_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['first_responsible_person_name'] = $first_responsible_person_name;
                 //查询责任人名称
                 $responsible_person = explode(',', $value['responsible_person']);
-                $responsible_person_name =  $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
+                $responsible_person_name =  $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->where('duty_type','2')->whereIn('employee_id', $responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['responsible_person_name'] = $responsible_person_name;
                 //查询来源责任人名称
                 $source_responsible_person = explode(',', $value['source_responsible_person']);
-                $source_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
+                $source_responsible_person_name = $ViolationStoreMemberModel->where('violation_store_logid',$value['id'])->where('duty_type','3')->whereIn('employee_id', $source_responsible_person)->pluck('employee_name')->toarray();
                 $result[$key]['source_responsible_person_name'] = $source_responsible_person_name;
             }
         }

app/Models/Manager/Process/LowPriceGoods.php

@@ -124,6 +124,7 @@ class LowPriceGoods extends Model
         if ($is_import == false) {
             //去重规则：品牌方公司ID+店铺公司名称+店铺名称+品牌名称+商品名称+规格+盒数(针对采集)
             $source_where[] = ['company_id', '=', $data['company_id']]; //品牌方公司ID
+            $source_where[] = ['platform', '=', $data['platform']]; //平台
             $source_where[] = ['company_name', '=', $data['company_name']]; //店铺公司名称
             $source_where[] = ['store_name', '=', $data['store_name']]; //店铺名称
             $source_where[] = ['product_brand', '=', $data['product_brand']]; //品牌名称
@@ -144,8 +145,6 @@ class LowPriceGoods extends Model
         try {
             //执行挂网数据统计
             $data = $this->handleCountData($data);
-
-            $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
             $insert_data = [
                 'company_id' => $data['company_id'],
                 'source_id' => $data['source_id'],
@@ -218,6 +217,7 @@ class LowPriceGoods extends Model
                     ];
                 }
             }
+            $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
             $LowPriceGoodsMemberModel->insert($first_responsible_person_data);
             $responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
             $responsible_person_data = [];
@@ -246,6 +246,7 @@ class LowPriceGoods extends Model
                     ];
                 }
             }
+            $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
             $LowPriceGoodsMemberModel->insert($responsible_person_data);
             $source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
             $source_responsible_person_data = [];
@@ -274,6 +275,7 @@ class LowPriceGoods extends Model
                     ];
                 }
             }
+            $LowPriceGoodsMemberModel = new LowPriceGoodsMemberModel();
             $LowPriceGoodsMemberModel->insert($source_responsible_person_data);
             //添加通知
             // $this->addNotices($insert_data, $LowPriceGoods_id);

app/Models/Manager/Process/ViolationProduct.php

@@ -118,6 +118,7 @@ class ViolationProduct extends Model
         if ($is_import == false) {
             //去重规则：品牌方公司ID+店铺公司名称+店铺名称+品牌名称+商品名称+规格+盒数(针对采集)
             $source_where[] = ['company_id', '=', $data['company_id']]; //品牌方公司ID
+            $source_where[] = ['platform', '=', $data['platform']]; //平台
             $source_where[] = ['company_name', '=', $data['company_name']]; //店铺公司名称
             $source_where[] = ['store_name', '=', $data['store_name']]; //店铺名称
             $source_where[] = ['product_brand', '=', $data['product_brand']]; //品牌名称
@@ -133,8 +134,6 @@ class ViolationProduct extends Model
         try {
             //执行挂网数据统计
             $data = $this->handleCountData($data);
-
-            $ViolationProductMemberModel = new ViolationProductMemberModel();
             $insert_data = [
                 'company_id' => $data['company_id'],
                 'source_id' => $data['source_id'],
@@ -202,6 +201,7 @@ class ViolationProduct extends Model
                     ];
                 }
             }
+            $ViolationProductMemberModel = new ViolationProductMemberModel();
             $ViolationProductMemberModel->insert($first_responsible_person_data);
             $responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
             $responsible_person_data = [];
@@ -230,6 +230,7 @@ class ViolationProduct extends Model
                     ];
                 }
             }
+            $ViolationProductMemberModel = new ViolationProductMemberModel();
             $ViolationProductMemberModel->insert($responsible_person_data);
             $source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
             $source_responsible_person_data = [];
@@ -258,6 +259,7 @@ class ViolationProduct extends Model
                     ];
                 }
             }
+            $ViolationProductMemberModel = new ViolationProductMemberModel();
             $ViolationProductMemberModel->insert($source_responsible_person_data);
             //添加通知
             // $this->addNotices($insert_data, $ViolationProduct_id);

app/Models/Manager/Process/ViolationStore.php

@@ -88,7 +88,7 @@ class ViolationStore extends Model
         }
         DB::beginTransaction();
         try {
-            $ViolationStoreMemberModel = new ViolationStoreMemberModel();
+           
             $insert_data = [
                 'company_id' => $data['company_id'],
                 'source_id' => $data['source_id'],
@@ -144,6 +144,7 @@ class ViolationStore extends Model
                     ];
                 }
             }
+            $ViolationStoreMemberModel = new ViolationStoreMemberModel();
             $ViolationStoreMemberModel->insert($first_responsible_person_data);
             $responsible_persons = $data['responsible_person'] != '' ? explode(',', $data['responsible_person']) : [];
             $responsible_person_data = [];
@@ -172,6 +173,7 @@ class ViolationStore extends Model
                     ];
                 }
             }
+            $ViolationStoreMemberModel = new ViolationStoreMemberModel();
             $ViolationStoreMemberModel->insert($responsible_person_data);
             $source_responsible_persons = $data['source_responsible_person'] != '' ? explode(',', $data['source_responsible_person']) : [];
             $source_responsible_person_data = [];
@@ -200,6 +202,7 @@ class ViolationStore extends Model
                     ];
                 }
             }
+            $ViolationStoreMemberModel = new ViolationStoreMemberModel();
             $ViolationStoreMemberModel->insert($source_responsible_person_data);
             //添加通知
             // $this->addNotices($insert_data, $ViolationStore_id);