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

Lyh server



查看合并请求 !2606

@@ -68,9 +68,7 @@ class UpdateRoute extends Command
      */
     public function handle()
     {
-        ProjectServer::useProject(4132);
-        return $this->product_action(4132);
-        DB::disconnect('custom_mysql');
+        return $this->_action();
     }
 
     /**
@@ -156,12 +154,17 @@ class UpdateRoute extends Command
      */
     public function _action(){
         $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status'=>0,'extend_type'=>0,'type'=>['!=',0]],'id',['id']);
-        $keywordModel = new Keyword();
+        $lists = $projectModel->list(['id'=>['in',[4379,4380,4381,4382,4383]],'delete_status'=>0,'extend_type'=>0,'type'=>['!=',0]],'id',['id']);
         foreach ($lists as $v){
             ProjectServer::useProject($v['id']);
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v['id'].PHP_EOL;
-            $keywordModel->edit(['type'=>1],['id'=>['!=',0]]);
+            $productModel = new Product();
+            $productModel->edit(['project_id'=>$v['id']],['id'=>['!=',0]]);
+            $productLists = $productModel->list([],'id',['id','title','route']);
+            foreach ($productLists as $item){
+                $route = RouteMap::setRoute($item['route'],'product',$item['id'],$v['id']);
+                $productModel->edit(['route'=>$route],['id'=>$item['id']]);
+            }
             DB::disconnect('custom_mysql');
         }
         return true;

@@ -64,7 +64,8 @@ class Channel extends Base
                 return $sales_id;
             }
             $channel_alias = self::where('id', $user['channel_id'])->value('alias');
-            $channel_alias = $channel_alias . '-' . $user['name'];
+            $channel_mobile = self::where('id', $user['channel_id'])->value('contact_mobile');
+            $channel_alias = $channel_alias . '-' . $user['name'].'-'.$channel_mobile;
             Cache::put('channel_alias_'.$sales_id,$channel_alias,24 * 3600);
         }
         return $channel_alias;