wugg hace 9 meses
padre
commit
d09220545d

+ 5 - 5
app/admin/controller/Brand.php

@@ -68,7 +68,7 @@ class Brand extends Base{
     {
         $param = $this->request->param(['brand_name' => '', 'logo_url' => '', 'is_del' => '0'], "post", "trim");
         $valid=Validate::rule([
-            'brand_name|品牌名称'=>'require|max:255|unique:\app\admin\model\Brand,is_del',
+            'brand_name|品牌名称'=>'require|max:255|unique:\app\admin\model\Brand,brand_name^is_del',
             'logo_url|品牌logo'=>'url'
         ]);
         if(!$valid->check($param)){
@@ -96,8 +96,8 @@ class Brand extends Base{
     {
         $param = $this->request->param(['id' => '', 'brand_name' => '', 'logo_url' => '', 'is_del' => '0'], "post", "trim");
         $valid=Validate::rule([
-            'id|品牌id'=>'require|int',
-            'brand_name|品牌名称'=>'require|max:255|unique:\app\admin\model\Brand,is_del',
+            'id|品牌id'=>'require|integer',
+            'brand_name|品牌名称'=>'require|max:255|unique:\app\admin\model\Brand,brand_name^is_del',
             'logo_url|品牌logo'=>'url'
         ]);
         if(!$valid->check($param)){
@@ -126,7 +126,7 @@ class Brand extends Base{
     {
         $param = $this->request->param(['id' => '', 'is_del' => '0'], "post", "trim");
         $valid=Validate::rule([
-            'id|品牌id'=>'require|int',
+            'id|品牌id'=>'require|integer',
         ]);
         if(!$valid->check($param)){
             return error($valid->getError());
@@ -156,7 +156,7 @@ class Brand extends Base{
     {
         $param = $this->request->param(['id' => '', 'status' => '0'], "post", "trim");
         $valid=Validate::rule([
-            'id|品牌id'=>'require|int',
+            'id|品牌id'=>'require|number|gt:0',
             'status|状态'=>'require|in:0,1'
         ]);
         if(!$valid->check($param)){

+ 2 - 2
app/admin/controller/BrandAuth.php

@@ -37,7 +37,7 @@ class BrandAuth extends Base{
         $valid= Validate::rule([
         	'brand_book|授权书图片'=>'max:255',
         	'gyscode|供应商编号'=>'require|max:255',
-        	'brand_id|品牌id'=>'require|number|gt:0|unique:app\admin\model\BrandBook,gyscode^is_del',
+        	'brand_id|品牌id'=>'require|number|gt:0|unique:app\admin\model\BrandBook,brand_id^gyscode^is_del',
         	'long|授权类型'=>'require|number|in:0,1',
         	'status|状态'=>'require|number|in:0,1',
         	'starttime|开始日期'=>'require|date|dateFormat:Y-m-d H:i:s',
@@ -183,7 +183,7 @@ class BrandAuth extends Base{
         	'id|主键id'=>'require|number|gt:0',
         	'brand_book|授权书图片'=>'url',
         	'gyscode|供应商编号'=>'require|max:255',
-        	'brand_id|品牌id'=>'require|number|gt:0|unique:app\admin\model\BrandBook,gyscode^is_del',
+        	'brand_id|品牌id'=>'require|number|gt:0|unique:app\admin\model\BrandBook,brand_id^gyscode^is_del',
         	'long|授权类型'=>'require|number|in:0,1',
         	'status|状态'=>'require|number|in:0,1',
         	'starttime|开始日期'=>'require|date|dateFormat:Y-m-d H:i:s',

+ 38 - 4
app/admin/controller/Cate.php

@@ -10,7 +10,7 @@
 namespace app\admin\controller;
 
 
-use app\admin\model\CatSpecs;use think\App;
+use app\admin\model\CatSpecs;use think\App;use think\facade\Validate;
 class Cate extends Base{
     public function __construct(App $app) {
         parent::__construct($app);
@@ -32,9 +32,43 @@ class Cate extends Base{
       });
       return success("获取成功",$data);
     }
+
     public function create(){
-        $param=$this->request->param(['cat_name', 'pid', 'cat_desc' => '', 'fund_code' => '', 'specs_id', 'weight' => 0, 'status' => 0],"post","trim");
-        $data=$this->model->create($param);
-        return success("添加成功",$data);
+        $param=$this->request->param(['cat_name', 'pid', 'cat_desc' => '', 'fund_code' => '', 'specs_id'=>[], 'weight'
+        => 0, 'status' => 0],"post","trim");
+        $valid=Validate::rule([
+            "cat_name|分类名称"=>"require|max:255|unique:app\admin\model\Cat,cat_name^is_del",
+            "pid|父级分类"=>"require|integer|egt:0",
+            "cat_desc|分类描述"=>"max:255",
+            "fund_code|财务代码"=>"max:255",
+            "specs_id|规格id"=>"require|array",
+            "weight|权重"=>"int",
+            "status|状态"=>"int|in:0,1",
+        ]);
+        if(!$valid->check($param))return error($valid->getError());
+        $parent = $this->model->where("id",$param["pid"])->findOrEmpty();
+        if($parent->isEmpty())return error("父级分类不存在");
+        $this->model->startTrans();
+        try{
+            $create=[
+                "cat_name"=>$param['cat_name'],
+                "pid"=>$param["pid"],
+                "cat_desc"=>$param["cat_desc"],
+                "fund_code"=>$param["fund_code"],
+                "weight"=>$param["weight"],
+                "status"=>$param["status"],
+                'creater' => $this->uname,
+                'createrid' =>$this->uid,
+                ];
+            $data=$this->model->create($create);
+            if($data->isEmpty())return error("添加失败");
+            $spec=$data->specs()->saveAll($param["specs_id"]);
+            if($spec->isEmpty())return error("添加失败");
+            $this->model->commit();
+        }catch (\Exception $e){
+            $this->model->rollback();
+            return error($e->getMessage());
+        }
+        return success("添加成功");
     }
 }