周海龙 / globalso · 提交

转到一个项目

作者 liyuhang
提交 0f35777c49a96cefd74b1b57c2d6dc2ca688141f 1 个父辈 2bcb68f5

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 128 行增加 和 49 行删除
... ... @@ -30,6 +30,9 @@ class NewsCategoryController extends BaseController
*/
public function add(NewsCategoryRequest $request,NewsCategoryModel $newsCategory){
$request->validated();
$this->param['project_id'] = $this->user['project_id'];
$this->param['Operator_id'] = $this->uid;
$this->param['create_id'] = $this->uid;
$rs = $newsCategory->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ... @@ -49,10 +52,12 @@ class NewsCategoryController extends BaseController
],[
'id.required' => 'ID不能为空'
]);
$this->param['Operator_id'] = $this->uid;
$rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
//写入日志
$this->response('success',Code::SUCCESS);
}
... ... @@ -70,7 +75,8 @@ class NewsCategoryController extends BaseController
'id.required' => 'ID不能为空',
'status.required' => 'status不能为空'
]);
$rs = $newsCategory->edit(['status'=>$this->param['status']],['id'=>$this->param['id']]);
$this->param['Operator_id'] = $this->uid;
$rs = $newsCategory->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
... ... @@ -90,22 +96,18 @@ class NewsCategoryController extends BaseController
'id.required' => 'ID不能为空',
]);
foreach ($this->param['id'] as $v){
var_dump($v);
//查询是否有子分类
$id = $newsCategory->read(['pid'=>$v],['id']);
if($id !== false){
$rs = $newsCategory->read(['pid'=>$v],['id']);
if($rs !== false){
$this->response('当前分类拥有子分类不允许删除',Code::USER_ERROR);
}
//查看当前分内下是否有商品
$id = $news->read(['category_id'=>$v],['id']);
if($id !== false){
$rs = $news->read(['category_id'=>$v],['id']);
if($rs !== false){
$this->response('当前分类拥有商品',Code::USER_ERROR);
}
}
$this->param['id'] = ['in',$id];
var_dump($this->map);
die();
$this->param['id'] = ['in',$this->param['id']];
$rs = $newsCategory->del($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
... ...
... ... @@ -2,17 +2,99 @@
namespace App\Http\Controllers\Bside\News;
use App\Enums\Common\Code;
use App\Http\Controllers\Bside\BaseController;
use App\Http\Requests\Bside\News\NewsRequest;
use App\Models\News\News as NewsModel;
use Illuminate\Http\Request;
class NewsController extends BaseController
{
/**
* @name :获取新闻列表
* @return json
* @author :liyuhang
* @method
*/
public function lists(NewsModel $news){
$lists = $news->lists($this->map,$this->page,$this->row,$this->order);
$this->response('success',Code::SUCCESS,$lists);
}
/**
* @name :添加分类
* @return json
* @author :liyuhang
* @method
*/
public function add(NewsRequest $newsRequest,NewsModel $news){
$newsRequest->validated();
$this->param['user_id'] = $this->uid;
$this->param['Operator_id'] = $this->uid;
$rs = $news->add($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
/**
* @name :编辑分类
* @return void
* @author :liyuhang
* @method
*/
public function lists(){
public function edit(NewsRequest $newsRequest,NewsModel $news){
$newsRequest->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$rs = $news->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
//写入日志
$this->response('success',Code::SUCCESS);
}
/**
* @name :编辑状态/与排序
* @return void
* @author :liyuhang
* @method
*/
public function status(Request $request,NewsModel $news){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$this->param['Operator_id'] = $this->uid;
$rs = $news->edit($this->param,['id'=>$this->param['id']]);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
/**
* @name :删除分类
* @return void
* @author :liyuhang
* @method
*/
public function del(Request $request,NewsModel $news){
$request->validate([
'id'=>['required'],
],[
'id.required' => 'ID不能为空',
]);
$this->param['id'] = ['in',$this->param['id']];
$rs = $news->del($this->param);
if($rs === false){
$this->response('error',Code::USER_ERROR);
}
$this->response('success');
}
}
... ...
... ... @@ -125,46 +125,41 @@ class Base extends Model
$query->where($k,$v);
continue;
}
foreach ($v as $k1 => $v1){
if(!is_array($v1)){
$query->where($k1,$v1);
continue;
}
switch ($v1[0]){
case 'like':
// like查询 ['name|title'=> ['like','%a%']]
if (strpos($k1, '|') !== false) {
$query->where(function ($query) use ($k1,$v1) {
$item = explode('|', $k1);
foreach ($item as $vo) {
$query->orWhere($vo, $v1[0], $v1[1]);
}
});
} else {
$query->where($k1,$v1[0], $v1[1]);
}
break;
case 'in':
// in查询 ['id'=>['in'=>[1,2,3]]]
$query->whereIn($k1, $v1[1]);
break;
case 'no in':
// in查询 ['id'=>['not in'=>[1,2,3]]]
$query->whereNotIn($k1, $v1[1]);
break;
case 'between':
// in查询 ['id'=>['between'=>[create1,create2]]]
$query->whereBetween($k1, $v1[1]);
case 'not between':
// not between查询 ['created_at'=>['not between'=>['xxx', 'xxx]]]
$query->whereNotBetween($k1, $v1[1]);
break;
default:
$query->where($k1,$v1[0],$v1[1]);
break;
}
switch ($v[0]){
case 'like':
// like查询 ['name|title'=> ['like','%a%']]
if (strpos($k, '|') !== false) {
$query->where(function ($query) use ($k,$v) {
$item = explode('|', $k);
foreach ($item as $vo) {
$query->orWhere($vo, $v[0], $v[1]);
}
});
} else {
$query->where($k, $v[0], $v[1]);
}
break;
case 'in':
// in查询 ['id'=>['in',[1,2,3]]]
$query->whereIn($k, $v[1]);
break;
case 'no in':
// in查询 ['id'=>['not in',[1,2,3]]]
$query->whereNotIn($k, $v[1]);
break;
case 'between':
// in查询 ['id'=>['between',[create1,create2]]]
$query->whereBetween($k, $v[1]);
case 'not between':
// not between查询 ['created_at'=>['not between',['xxx', 'xxx]]]
$query->whereNotBetween($k, $v[1]);
break;
default:
$query->where($k,$v[0],$v[1]);
break;
}
}
});
return $query;
}
... ...