Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into lyh-server

@@ -117,6 +117,7 @@ class AdsController extends BaseController
         $ad_url = trim($request->input('ad_url'));
         $ad_url = trim($request->input('ad_url'));
         $ad_img = trim($request->input('ad_img'));
         $ad_img = trim($request->input('ad_img'));
         $num = intval($request->input('num'));
         $num = intval($request->input('num'));
+        $is_show_fb_source = intval($request->input('is_show_fb_source'));
         $status = intval($request->input('status'));
         $status = intval($request->input('status'));
         $is_replace_text = intval($request->input('is_replace_text'));
         $is_replace_text = intval($request->input('is_replace_text'));
         $ai_param = $request->input('ai_param');
         $ai_param = $request->input('ai_param');
@@ -138,7 +139,19 @@ class AdsController extends BaseController
                 return $this->response('英文缩写参考不能为空！', Code::USER_ERROR, []);
                 return $this->response('英文缩写参考不能为空！', Code::USER_ERROR, []);
             }
             }
         }
         }
-        ReInquiryTask::createTask($id, $title, $industry, $ad_id, $ad_url, $ad_img, $num, $status, $is_replace_text, $ai_param);
+        $task = ReInquiryTask::createTask($id, $title, $industry, $ad_id, $ad_url, $ad_img, $num, $status, $is_replace_text, $ai_param, $is_show_fb_source);
+
+        //是否显示FB标识
+        foreach ($task['target'] as $target){
+            if($target['is_v6']){
+                $project = Project::getProjectByDomain($target['url']);
+                if($project){
+                    $project->is_show_fb_source = $is_show_fb_source;
+                    $project->save();
+                }
+            }
+        }
+
         return $this->response('success', Code::SUCCESS, []);
         return $this->response('success', Code::SUCCESS, []);
     }
     }
 
 
@@ -183,6 +196,15 @@ class AdsController extends BaseController
         }
         }
         foreach ($target as $v){
         foreach ($target as $v){
             ReInquiryCount::addInquiryNum($id, $v['url'], 0);
             ReInquiryCount::addInquiryNum($id, $v['url'], 0);
+
+            //是否显示FB标识
+            if($target['is_v6']){
+                $project = Project::getProjectByDomain($target['url']);
+                if($project){
+                    $project->is_show_fb_source = $task->is_show_fb_source;
+                    $project->save();
+                }
+            }
         }
         }
 
 
         //商城
         //商城
@@ -209,6 +231,7 @@ class AdsController extends BaseController
         $task->shop_site = json_encode($shop_site);
         $task->shop_site = json_encode($shop_site);
         $task->fob_pro = json_encode($fob_pro);
         $task->fob_pro = json_encode($fob_pro);
         $task->save();
         $task->save();
+
         return $this->response('success', Code::SUCCESS, []);
         return $this->response('success', Code::SUCCESS, []);
     }
     }
 
 

@@ -56,6 +56,7 @@ class InquiryLogic extends BaseLogic
         ];
         ];
         if (!empty($list['status']) && $list['status'] == 200) {
         if (!empty($list['status']) && $list['status'] == 200) {
             foreach ($list['data']['data'] as $item) {
             foreach ($list['data']['data'] as $item) {
+                $item['is_fb'] = $project['is_show_fb_source'] && $item['source'] == 5 ? 1 : 0;
                 $data['list'][] = $item;
                 $data['list'][] = $item;
             }
             }
             $data['total'] = $list['data']['total'];
             $data['total'] = $list['data']['total'];

@@ -41,7 +41,7 @@ class ReInquiryTask extends Base
      * @param int $status
      * @param int $status
      * @return ReInquiryTask
      * @return ReInquiryTask
      */
      */
-    public static function createTask($id, $title, $industry, $ad_id, $ad_url, $ad_img, $num, $status, $is_replace_text, $ai_param)
+    public static function createTask($id, $title, $industry, $ad_id, $ad_url, $ad_img, $num, $status, $is_replace_text, $ai_param, $is_show_fb_source)
     {
     {
         $self = self::where(['id' => $id])->first();
         $self = self::where(['id' => $id])->first();
         if (empty($self))
         if (empty($self))
@@ -55,6 +55,7 @@ class ReInquiryTask extends Base
         $self->status = $status;
         $self->status = $status;
         $self->is_replace_text = $is_replace_text;
         $self->is_replace_text = $is_replace_text;
         $self->ai_param = $ai_param;
         $self->ai_param = $ai_param;
+        $self->is_show_fb_source = $is_show_fb_source;
         $self->save();
         $self->save();
         return $self;
         return $self;
     }
     }