删除分类

app-ghs/controllers/ItemClassController.php

@@ -9,6 +9,7 @@ namespace ghs\controllers;
 
 use bizGhs\item\classes\ItemClassClass;
 use bizGhs\item\services\ItemClassService;
+use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use Yii;
 
@@ -72,10 +73,17 @@ class ItemClassController extends BaseController
         util::complete('修改成功');
     }
 
+    //删除分类  shish 20211015
     public function actionDelete()
     {
         $id = Yii::$app->request->get('id', 0);
-        ItemClassService::deleteGhsItemClass($id, $this->sjId);
+        $class = ItemClassClass::getById($id, true);
+        ItemClassClass::valid($class, $this->sjId);
+        $has = ProductClass::getByCondition(['classId' => $id], true);
+        if (!empty($has)) {
+            util::fail('此分类还有花材');
+        }
+        $class->delete();
         util::complete('操作成功');
     }
 

biz-ghs/item/classes/ItemClassClass.php

@@ -17,7 +17,6 @@ class ItemClassClass extends BaseClass
     public static $baseFile = '\bizGhs\item\models\ItemClass';
 
 
-
     public static function getGhsItemClassList($where)
     {
         $data = self::getList('*', $where, 'inTurn DESC');
@@ -30,20 +29,20 @@ class ItemClassClass extends BaseClass
     }
 
     //新增花材分类
-    public static function addGhsItemClass($sjId,$data)
+    public static function addGhsItemClass($sjId, $data)
     {
-        if(!$sjId){
+        if (!$sjId) {
             util::fail("请选择供应商");
         }
         $data['sjId'] = $sjId;
-        $name = $data['name']??'';
-        if(!$name){
+        $name = $data['name'] ?? '';
+        if (!$name) {
             util::fail("请输入花材分类");
         }
 
         //判断花材名称是否存在（当前sjId下）
-        $exist = self::exists(['sjId'=>$sjId,'name'=>$name]);
-        if($exist){
+        $exist = self::exists(['sjId' => $sjId, 'name' => $name]);
+        if ($exist) {
             util::fail("花材分类名称已存在");
         }
 
@@ -61,23 +60,23 @@ class ItemClassClass extends BaseClass
     //修改
     public static function updateGhsItemClass($data)
     {
-        $id = $data['id']??0;
-        $sjId = $data['sjId']??0;
-        $name = $data['name']??'';
-        if(!$sjId){
+        $id = $data['id'] ?? 0;
+        $sjId = $data['sjId'] ?? 0;
+        $name = $data['name'] ?? '';
+        if (!$sjId) {
             util::fail("请选择供应商");
         }
-        if(!$name){
+        if (!$name) {
             util::fail("花材分类名称不能为空");
         }
         $model = self::getById($id);
-        if(!$model){
+        if (!$model) {
             util::fail("该花材分类不存在");
         }
-        if($model['sjId'] !== $data['sjId']){
+        if ($model['sjId'] !== $data['sjId']) {
             util::fail("参数错误");
         }
-        self::updateById($id,$data);
+        self::updateById($id, $data);
         return true;
     }
 
@@ -85,9 +84,9 @@ class ItemClassClass extends BaseClass
     public static function getGhsItemClassAll($sjId)
     {
         $where = [
-            'sjId'=>$sjId
+            'sjId' => $sjId
         ];
-        $data = self::getAllList('id,name',$where,'inTurn desc');
+        $data = self::getAllList('id,name', $where, 'inTurn desc');
         return $data;
     }
 
@@ -101,10 +100,10 @@ class ItemClassClass extends BaseClass
         return $data;
     }
 
-    public static function valid($classId,$sjId)
+    //验证分类 shish 20211015
+    public static function valid($class, $sjId)
     {
-        $data = self::getById($classId);
-        if ($data['sjId'] == $sjId) {
+        if ($class->sjId == $sjId) {
             return true;
         }
         util::fail('分类不正确');
@@ -114,17 +113,17 @@ class ItemClassClass extends BaseClass
     public static function getDefaultClassId($sjId)
     {
         $where = [
-            'sjId'=>$sjId,
-            'isDefault'=>1,
+            'sjId' => $sjId,
+            'isDefault' => 1,
         ];
         $res = self::getByCondition($where);
-        if(!$res){
+        if (!$res) {
             //没有则新增
             $classData = [
-                'sjId'=>$sjId,
-                'name'=>'默认分组',
-                'inTurn'=>-9999,
-                'isDefault'=>1,
+                'sjId' => $sjId,
+                'name' => '默认分组',
+                'inTurn' => -9999,
+                'isDefault' => 1,
             ];
             $res = self::add($classData);
         }

biz-ghs/item/services/ItemClassService.php

@@ -21,12 +21,7 @@ class ItemClassService extends BaseService
     {
         //判断是否存在
         $model = ItemClassClass::getById($id);
-        if(!$model){
-            util::fail("该花材分类不存在");
-        }
-        if($model['sjId'] !== $sjId){
-            util::fail("参数错误");
-        }
+
         $exist = ItemClass::exists(['classId'=>$id,'sjId'=>$model['sjId']]);
         if($exist){
             util::fail("该花材分类还有花材，不能删除");

biz-ghs/product/classes/ProductClass.php

@@ -861,7 +861,6 @@ class ProductClass extends BaseClass
         //分类ID
         if (isset($data["classId"])) {
             $classId = $data['classId'];
-            ItemClassClass::valid($classId, $product->sjId);
             $upData['classId'] = $classId;
         }