合并分支 'master-server' 到 'master'

Master server



查看合并请求 !898

@@ -30,6 +30,7 @@ use App\Models\Product\Product;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\MinorLanguages;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
+use App\Models\Purchaser\Purchaser;
 use App\Models\Purchaser\PurchaserInfo;
 use App\Models\Purchaser\PurchaserInfo;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BCustomTemplate;
 use App\Models\Template\BCustomTemplate;
@@ -60,14 +61,15 @@ class Demo extends Command
     protected $description = 'demo';
     protected $description = 'demo';
 
 
     public function handle(){
     public function handle(){
-        $projectModel = new Project();
-        $list = $projectModel->list(['id'=>1659]);
-        foreach ($list as $v){
-            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-            ProjectServer::useProject($v['id']);
-            $this->getProduct();
-            DB::disconnect('custom_mysql');
-        }
+//        $projectModel = new Project();
+//        $list = $projectModel->list(['id'=>1659]);
+//        foreach ($list as $v){
+//            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+//            ProjectServer::useProject($v['id']);
+//            $this->getProduct();
+//            DB::disconnect('custom_mysql');
+//        }
+        return $this->savePurchaserInfo();
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
@@ -84,4 +86,38 @@ class Demo extends Command
             }
             }
         }
         }
     }
     }
+
+    /**
+     * @remark :保存供应商详情
+     * @name   :savePurchaserInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2024/5/29 16:38
+     */
+    public function savePurchaserInfo(){
+        $purchaserModel = new Purchaser();
+        $list = $purchaserModel->list();
+        foreach ($list as $val){
+            $project_id = $val['project_id'];
+            $keyword = $val['keyword'];
+            $data = json_decode($val['data'],JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+            $purchaserInfoModel = new PurchaserInfo();
+            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['image'] = str_replace('admin.hagro.cn','fob.ai.cc',$v['image']);
+                $param = $v;
+                $info = $purchaserInfoModel->read(['keyword'=>$keyword,'buyer_id'=>$v['buyer_id'],'project_id'=>$project_id],['id']);
+                echo date('Y-m-d H:i:s') . '数据已存在 :'.$info['id'] . PHP_EOL;
+                if($info === false){
+                    echo date('Y-m-d H:i:s') . '执行新增 :' . PHP_EOL;
+                    $purchaserInfoModel->add($param);
+                }
+            }
+        }
+        return true;
+    }
 }
 }

@@ -35,12 +35,12 @@ class SuppliersController extends BaseController
     public function recommendedPurchaser(){
     public function recommendedPurchaser(){
         $purchaserModel = new PurchaserInfo();
         $purchaserModel = new PurchaserInfo();
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $data = $purchaserModel->list($this->map);
-        foreach ($data as $k => $v){
+        $data = $purchaserModel->lists($this->map,$this->page,$this->row);
+        foreach ($data['list'] as $k => $v){
             $v['email'] = json_decode($v['email'],true);
             $v['email'] = json_decode($v['email'],true);
             $v['mobile'] = json_decode($v['mobile'],true);
             $v['mobile'] = json_decode($v['mobile'],true);
             $v['social_media'] = json_decode($v['social_media'],true);
             $v['social_media'] = json_decode($v['social_media'],true);
-            $data[$k] = $v;
+            $data['list'][$k] = $v;
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }