周海龙 / globalso · 提交

转到一个项目

作者 张关杰
提交 42aa40ac98978a1d583a625d48fb0f27d87c3e01 2 个父辈 748ffde2 1242a5ae

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

内嵌 并排对比
正在显示 9 个修改的文件 包含 42 行增加 和 37 行删除
@@ -50,7 +50,7 @@ class UpdateProductCategory extends Command @@ -50,7 +50,7 @@ class UpdateProductCategory extends Command
50 public function handle(){ 50 public function handle(){
51 //获取所有项目 51 //获取所有项目
52 $projectModel = new Project(); 52 $projectModel = new Project();
53 - $list = $projectModel->list(['id'=>['in',[218]]],'id',['id']); 53 + $list = $projectModel->list(['id'=>['in',[475]]],'id',['id']);
54 echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL; 54 echo date('Y-m-d H:i:s') . ' start: ' . json_encode($list) . PHP_EOL;
55 try { 55 try {
56 foreach ($list as $v) { 56 foreach ($list as $v) {
@@ -60,14 +60,7 @@ class UpdateRoute extends Command @@ -60,14 +60,7 @@ class UpdateRoute extends Command
60 foreach ($list as $v){ 60 foreach ($list as $v){
61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 61 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
62 ProjectServer::useProject($v['id']); 62 ProjectServer::useProject($v['id']);
63 -// $this->delProductKeyword();  
64 -// $this->checkProduct($data,$v['id']);  
65 -// $this->getProduct();  
66 $this->setProductKeyword(); 63 $this->setProductKeyword();
67 -// $this->getRouteMap();  
68 -// $this->getProductCategory();  
69 -// $this->delRouteMap();  
70 -// $this->setCustomRoute($v['id']);  
71 DB::disconnect('custom_mysql'); 64 DB::disconnect('custom_mysql');
72 } 65 }
73 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL; 66 echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -114,19 +107,19 @@ class UpdateRoute extends Command @@ -114,19 +107,19 @@ class UpdateRoute extends Command
114 if(!empty($lists)){ 107 if(!empty($lists)){
115 foreach ($lists as $v){ 108 foreach ($lists as $v){
116 if(!empty($v['route'])){ 109 if(!empty($v['route'])){
117 -// $tag = "-tag";  
118 -// if ((substr($v['route'], -strlen($tag)) === $tag)) {  
119 -// echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;  
120 -//// $route = Translate::tran($v['route'], 'en').$tag;  
121 -// // 如果不是以 '-tag' 结尾，则拼接上 '-tag'  
122 -// $route = trim($v['route'],'-tag');  
123 -// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
124 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
125 -// }else{  
126 -// $route = Translate::tran($v['title'], 'en').$tag;  
127 -// $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);  
128 -// $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);  
129 -// } 110 + $tag = "-tag";
  111 + if ((substr($v['route'], -strlen($tag)) === $tag)) {
  112 + echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
  113 +// $route = Translate::tran($v['route'], 'en').$tag;
  114 + // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
  115 + $route = trim($v['route'],'-tag');
  116 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  117 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  118 + }else{
  119 + $route = Translate::tran($v['title'], 'en').$tag;
  120 + $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
  121 + $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
  122 + }
130 }else{ 123 }else{
131 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL; 124 echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
132 $route = Translate::tran($v['title'], 'en'); 125 $route = Translate::tran($v['title'], 'en');
@@ -111,14 +111,10 @@ class ProductController extends BaseController @@ -111,14 +111,10 @@ class ProductController extends BaseController
111 public function searchParam(&$query){ 111 public function searchParam(&$query){
112 $query = $query->where('project_id',$this->user['project_id']); 112 $query = $query->where('project_id',$this->user['project_id']);
113 if (isset($this->map['category_id']) && !empty($this->map['category_id'])) { 113 if (isset($this->map['category_id']) && !empty($this->map['category_id'])) {
114 - $str = [];  
115 $str[] = $this->map['category_id']; 114 $str[] = $this->map['category_id'];
116 - $this->getAllSub($this->map['category_id'],$str);  
117 - $query->where(function ($subQuery) use ($str) {  
118 - foreach ($str as $v) {  
119 - $subQuery->orWhereRaw("FIND_IN_SET(?, category_id) > 0", [$v]);  
120 - }  
121 - }); 115 + $str = $this->getAllSub($this->map['category_id'],$str);
  116 + $productArr = CategoryRelated::whereIn('cate_id',$str)->pluck('product_id')->toArray();
  117 + $query->whereIn('id',$productArr);
122 } 118 }
123 if(isset($this->map['title']) && !empty($this->map['title'])){ 119 if(isset($this->map['title']) && !empty($this->map['title'])){
124 $query = $query->where('title','like','%'.$this->map['title'].'%'); 120 $query = $query->where('title','like','%'.$this->map['title'].'%');
@@ -34,7 +34,11 @@ class BlogLogic extends BaseLogic @@ -34,7 +34,11 @@ class BlogLogic extends BaseLogic
34 try { 34 try {
35 $this->param = $this->paramProcessing($this->param); 35 $this->param = $this->paramProcessing($this->param);
36 if(isset($this->param['id']) && !empty($this->param['id'])){ 36 if(isset($this->param['id']) && !empty($this->param['id'])){
37 - $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']); 37 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  38 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  39 + if($is_upgrade == 0 || $six_read == 1){
  40 + $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_BLOG, $this->param['id'], $this->user['project_id']);
  41 + }
38 $route = $this->param['url']; 42 $route = $this->param['url'];
39 $this->edit($this->param,['id'=>$this->param['id']]); 43 $this->edit($this->param,['id'=>$this->param['id']]);
40 }else{ 44 }else{
@@ -150,6 +150,7 @@ class CustomModuleCategoryLogic extends BaseLogic @@ -150,6 +150,7 @@ class CustomModuleCategoryLogic extends BaseLogic
150 * @time :2023/12/5 10:55 150 * @time :2023/12/5 10:55
151 */ 151 */
152 public function categoryEdit(){ 152 public function categoryEdit(){
  153 +
153 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE, 154 $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE_CATE,
154 $this->param['id'], $this->user['project_id']); 155 $this->param['id'], $this->user['project_id']);
155 $this->editRoute($this->param['id'],$route); 156 $this->editRoute($this->param['id'],$route);
@@ -186,9 +186,12 @@ class CustomModuleContentLogic extends BaseLogic @@ -186,9 +186,12 @@ class CustomModuleContentLogic extends BaseLogic
186 * @time :2023/12/7 15:04 186 * @time :2023/12/7 15:04
187 */ 187 */
188 public function contentEdit(){ 188 public function contentEdit(){
189 - $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE,  
190 - $this->param['id'], $this->user['project_id']);  
191 - $this->editRoute($this->param['id'],$route); 189 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  190 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  191 + if($is_upgrade == 0 || $six_read == 1) {
  192 + $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_MODULE, $this->param['id'], $this->user['project_id']);
  193 + }
  194 + $this->editRoute($this->param['id'],$this->param['route']);
192 $rs = $this->model->edit($this->param,['id'=>$this->param['id']]); 195 $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
193 if($rs === false){ 196 if($rs === false){
194 $this->fail('系统错误，请连续管理员'); 197 $this->fail('系统错误，请连续管理员');
@@ -64,7 +64,11 @@ class NewsLogic extends BaseLogic @@ -64,7 +64,11 @@ class NewsLogic extends BaseLogic
64 try { 64 try {
65 $this->param = $this->paramProcessing($this->param); 65 $this->param = $this->paramProcessing($this->param);
66 if (isset($this->param['id']) && !empty($this->param['id'])) { 66 if (isset($this->param['id']) && !empty($this->param['id'])) {
67 - $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']); 67 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1：6.0
  68 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  69 + if($is_upgrade == 0 || $six_read == 1) {
  70 + $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $this->param['id'], $this->user['project_id']);
  71 + }
68 //是否更新路由 72 //是否更新路由
69 $route = $this->param['url']; 73 $route = $this->param['url'];
70 $this->edit($this->param, ['id' => $this->param['id']]); 74 $this->edit($this->param, ['id' => $this->param['id']]);
@@ -46,7 +46,11 @@ class ProductLogic extends BaseLogic @@ -46,7 +46,11 @@ class ProductLogic extends BaseLogic
46 $this->param = $this->handleSaveParam($this->param); 46 $this->param = $this->handleSaveParam($this->param);
47 try { 47 try {
48 if(isset($this->param['id']) && !empty($this->param['id'])){ 48 if(isset($this->param['id']) && !empty($this->param['id'])){
49 - $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']); 49 + $is_upgrade = $this->param['is_upgrade'] ?? 0;//5.0数据 1:6.0数据
  50 + $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
  51 + if($is_upgrade == 0 || $six_read == 1){
  52 + $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
  53 + }
50 $route = $this->param['route']; 54 $route = $this->param['route'];
51 $this->model->edit($this->param,['id'=>$this->param['id']]); 55 $this->model->edit($this->param,['id'=>$this->param['id']]);
52 $id = $this->param['id']; 56 $id = $this->param['id'];
@@ -67,10 +67,10 @@ class Category extends Base @@ -67,10 +67,10 @@ class Category extends Base
67 * @date 2023/4/28 67 * @date 2023/4/28
68 */ 68 */
69 public function getProductNum($cate_id){ 69 public function getProductNum($cate_id){
70 - $str = []; 70 + $str[] = $cate_id;
71 $cate_ids = $this->getAllSub($cate_id,$str); 71 $cate_ids = $this->getAllSub($cate_id,$str);
72 - $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();  
73 -// $str = 0; 72 + $productArr = CategoryRelated::whereIn('cate_id',$cate_ids)->pluck('product_id')->unique()->toArray();
  73 + $count = count($productArr);
74 return $count; 74 return $count;
75 } 75 }
76 } 76 }