合并分支 'master-lyh-edit' 到 'master'

处理定制项目



查看合并请求 !617

@@ -82,15 +82,18 @@ class Count extends Command
                     $arr['updated_at'] = date('Y-m-d H:i:s');
                     //询盘统计
                     $arr = $this->inquiry($arr,$v['test_domain'], $v['id']);
-                    echo date('Y-m-d H:i:s') .  json_encode($arr) . '->' .  PHP_EOL;
-                    $data[] = $arr;
+                    if($arr === false){
+                        $data[] = $v['test_domain'];
+                    }
+                    //判断数据是否存在
+                    DB::table('gl_count')->insert($arr);
                 }
-                //判断数据是否存在
-                DB::table('gl_count')->insert($data);
             }
         }catch (\Exception $e){
             echo date('Y-m-d H:i:s') . ' error: '  . '->' . $e->getMessage() . PHP_EOL;
+            Log::channel('day_count')->error('day_count：失败 ' . $e->getMessage());
         }
+        Log::channel('day_count')->error('day_count：失败的域名 ' .json_encode($data));
         echo date('Y-m-d H:i:s') . ' end: ' . PHP_EOL;
         echo $this->error;
     }
@@ -127,6 +130,9 @@ class Count extends Command
      */
     public function inquiry($arr,$domain,$project_id){
         $inquiry_list = (new FormGlobalsoApi())->getInquiryList($domain,'',1,100000000);
+        if($inquiry_list == false){
+            return false;
+        }
         if($inquiry_list['status'] == self::STATUS_ERROR){
             $arr['inquiry_num'] = 0;
             $countryArr = [];

@@ -42,16 +42,16 @@ class ImportChannel extends Command
             'channel'=>['like','%"user_id": "0"%'],
         ];
         $lists = $projectModel->list($map);
-//        var_dump($lists);
-//        die();
-        foreach ($lists as $k => $v){
-            $order_id = $v['notice_order_id'];
-            $api = new OaGlobalsoApi();
-            $data = $api->order_info($order_id);
-            $data = $data['data'];
-            $channel = Channel::getProjectChannel($data['company_id'], $data['username_sales']);
-            $projectModel->edit(['channel'=>$channel],['id'=>$v['id']]);
+        if(!empty($lists)){
+            foreach ($lists as $k => $v){
+                $order_id = $v['notice_order_id'];
+                $api = new OaGlobalsoApi();
+                $data = $api->order_info($order_id);
+                $data = $data['data'];
+                $channel = Channel::getProjectChannel($data['company_id'], $data['username_sales']);
+                $projectModel->edit(['channel'=>$channel],['id'=>$v['id']]);
+            }
         }
-        return 1;
+        return true;
     }
 }

@@ -30,7 +30,7 @@ class ImportManager extends Command
      *
      * @var string
      */
-    protected $description = '导入数据';
+    protected $description = '导入数据(同步5.0人事信息)';
     /**
      * @remark :导入5.0管理员数据
      * @name   :handle

@@ -57,13 +57,10 @@ class LastInquiry extends Command
             //其他询盘的最新时间
             ProjectServer::useProject($item['id']);
             $other_last_time = InquiryFormData::orderBy('id', 'desc')->value('submit_at');
-
             $last_inquiry_time = $last_time > $other_last_time ? $last_time : $other_last_time;
-
             if(!$last_inquiry_time){
                 continue;
             }
-
             $item->last_inquiry_time = $last_inquiry_time;
             $item->save();
         }

@@ -10,6 +10,7 @@ use App\Services\ProjectServer;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
 
 class InquiryMonthlyCount extends Command
 {
@@ -70,7 +71,11 @@ class InquiryMonthlyCount extends Command
             $arr['project_id'] = $value['project_id'];
             // 获取当前日期时间
             $arr['month'] = Carbon::now()->subMonth()->format('Y-m');
-            DB::table('gl_month_count')->insert($arr);
+            try {
+                DB::table('gl_month_count')->insert($arr);
+            }catch (\Exception $e){
+                Log::channel('month_count')->error('month_count：失败 ' . $e->getMessage());
+            }
         }
         return true;
     }

@@ -50,8 +50,6 @@ class HeaderFooter extends Command
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             DB::table('gl_web_template_com')->truncate();
-            $templateComModel = new BTemplateCom();
-            $templateComModel->truncate();
             $this->saveTemplateCom($v['id']);
             DB::disconnect('custom_mysql');
         }

@@ -131,7 +131,7 @@ class CustomTemplateLogic extends BaseLogic
         if($rs === false){
             $this->fail('系统错误，请联系管理');
         }
-        $this->setTemplateLog($bSettingInfo['template_id'],$html,$this->param['id']);
+        $this->setTemplateLog($bSettingInfo['template_id'] ?? 0,$html,$this->param['id']);
         //通知
         $this->addUpdateNotify(RouteMap::SOURCE_PAGE,$info['url']);
         $this->curlDelRoute(['route'=>$info['url'],'new_route'=>$info['url']]);

@@ -154,7 +154,7 @@ class KeywordLogic extends  BaseLogic
                 }
             }
         }catch (\Exception $e){
-            return false;
+            $this->fail('保存失败,请联系管理员');
         }
         Common::del_user_cache('product_keyword',$this->user['project_id']);
         NoticeLog::createLog(NoticeLog::TYPE_INIT_KEYWORD, ['project_id' => $this->user['project_id']]);

@@ -78,6 +78,18 @@ return [
             'via' => \App\Factory\LogFormatterFactory::class,
             'prefix' => 'test',
         ],
+        //日记录日志
+        'day_count' => [
+            'driver' => 'custom',
+            'via' => \App\Factory\LogFormatterFactory::class,
+            'prefix' => 'day_count',
+        ],
+        //月记录日志
+        'month_count' => [
+            'driver' => 'custom',
+            'via' => \App\Factory\LogFormatterFactory::class,
+            'prefix' => 'month_count',
+        ],
         'wechatside' => [
             'driver' => 'custom',
             'via' => \App\Factory\LogFormatterFactory::class,