Merge remote-tracking branch 'origin/master' into akun

@@ -9,14 +9,13 @@
 
 
 namespace App\Console\Commands\Suppliers;
 namespace App\Console\Commands\Suppliers;
 
 
-use App\Models\Com\Purchaser;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
-use App\Models\Project\Project;
+use App\Models\Purchaser\Purchaser;
+use App\Models\Purchaser\PurchaserInfo;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
 
 
 class RecommendedSuppliers extends Command
 class RecommendedSuppliers extends Command
 {
 {
@@ -98,7 +97,8 @@ class RecommendedSuppliers extends Command
         ];
         ];
         $res = http_post($url,json_encode($param));
         $res = http_post($url,json_encode($param));
         echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
         echo date('Y-m-d H:i:s') . json_encode($res) . PHP_EOL;
-        if(!empty($res) && $res['code'] == 200){
+        if(!empty($res) && $res['code'] == 200 && !empty($res['data'])){
+            //保存多条数据
             $saveData = [
             $saveData = [
                 'project_id'=>$project_id,
                 'project_id'=>$project_id,
                 'keyword'=>$keyword,
                 'keyword'=>$keyword,
@@ -106,7 +106,31 @@ class RecommendedSuppliers extends Command
             ];
             ];
             $purchaserModel = new Purchaser();
             $purchaserModel = new Purchaser();
             $purchaserModel->add($saveData);
             $purchaserModel->add($saveData);
+            $this->savePurchaserInfo($project_id,$keyword,$res['data']);
         }
         }
         return true;
         return true;
     }
     }
+
+    /**
+     * @remark :保存供应商详情
+     * @name   :savePurchaserInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/29 16:38
+     */
+    public function savePurchaserInfo($project_id,$keyword,$data){
+        $param = [];
+        foreach ($data as $k =>$v){
+            $v['project_id'] = $project_id;
+            $v['keyword'] = $keyword;
+            $v['email'] = json_encode($v['email'],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $v['mobile'] = json_encode($v['mobile'],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $v['social_media'] = json_encode($v['social_media'],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $v['created_at'] = date('Y-m-d H:i:s');
+            $v['updated_at'] = $v['created_at'];
+            $param[] = $v;
+        }
+        $purchaserInfoModel = new PurchaserInfo();
+        return $purchaserInfoModel->insert($param);
+    }
 }
 }

@@ -54,7 +54,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>917]);
+        $list = $projectModel->list(['id'=>['in',[358,951]]]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -6,10 +6,7 @@ use App\Enums\Common\Code;
 use App\Helper\Arr;
 use App\Helper\Arr;
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
-use App\Http\Logic\Aside\Project\ProjectLogic;
-use App\Http\Logic\Bside\User\UserLogic;
 use App\Jobs\PurchaserJob;
 use App\Jobs\PurchaserJob;
-use App\Models\Com\Purchaser;
 use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModule;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -18,7 +15,6 @@ use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\User;
 use App\Models\User\User;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Hash;
 
 
 /***
 /***
  * 当前为公共类
  * 当前为公共类

@@ -11,7 +11,7 @@ namespace App\Http\Controllers\Bside\Suppliers;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Controllers\Bside\BaseController;
-use App\Models\Com\Purchaser;
+use App\Models\Purchaser\Purchaser;
 
 
 /**
 /**
  * @remark :推荐采购商
  * @remark :推荐采购商
@@ -38,11 +38,13 @@ class SuppliersController extends BaseController
         $lists = $purchaserModel->list($this->map);
         $lists = $purchaserModel->list($this->map);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
-                $resultData = json_decode($v['data']);
-                foreach ($resultData as $value){
-                    $value = (array)$value;
-                    $value['keyword'] = $v['keyword'];
-                    $data[] = $value;
+                if(!empty($v['data'])){
+                    $resultData = json_decode($v['data'],true);
+                    foreach ($resultData as $value){
+                        $value = (array)$value;
+                        $value['keyword'] = $v['keyword'];
+                        $data[] = $value;
+                    }
                 }
                 }
             }
             }
         }
         }

@@ -176,9 +176,6 @@ class ProjectLogic extends BaseLogic
      * @time   :2023/8/30 12:14
      * @time   :2023/8/30 12:14
      */
      */
     public function saveProject($param){
     public function saveProject($param){
-        if($param['type'] == Project::TYPE_ONE){
-            $param['serve_id'] = 9;
-        }
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
         if((($param['type'] == Project::TYPE_TWO) || ($param['type'] == Project::TYPE_THREE)) && empty($param['uptime'])){
             $param['uptime'] = date('Y-m-d H:i:s');
             $param['uptime'] = date('Y-m-d H:i:s');
         }
         }

@@ -7,7 +7,7 @@
  * @time   :2024/3/4 14:39
  * @time   :2024/3/4 14:39
  */
  */
 
 
-namespace App\Models\Com;
+namespace App\Models\Purchaser;
 
 
 use App\Models\Base;
 use App\Models\Base;
 
 

+<?php
+/**
+ * @remark :
+ * @name   :PurchaserInfo.php
+ * @author :lyh
+ * @method :post
+ * @time   :2024/5/29 16:57
+ */
+
+namespace App\Models\Purchaser;
+
+use App\Models\Base;
+
+class PurchaserInfo extends Base
+{
+    protected $table = 'gl_purchaser_info';
+}