fix:查询指定实体的所有属性值,去除entity_type_id参数, 去除Helper静态方法调用

src/Controller/AttributeOptionController.php

@@ -2,31 +2,33 @@
 declare(strict_types=1);
 namespace SixShop\Eav\Controller;
 
-use SixShop\Core\Helper;
+
 use SixShop\Core\Request;
 use SixShop\Eav\Entity\EvaAttributeOptionEntity;
 use think\Response;
-use think\response\Json;
+
+
+use function SixShop\Core\success_response;
 
 class AttributeOptionController
 {
     public function index(Request $request, EvaAttributeOptionEntity $entity): Response
     {
         $attributeId = $request->get('attribute_id/d');
-        return Helper::success_response($entity->where(['attribute_id' =>$attributeId])->select());
+        return success_response($entity->where(['attribute_id' =>$attributeId])->select());
     }
 
     public function save(Request $request, EvaAttributeOptionEntity $entity): Response
     {
         $data = $request->post();
-        return Helper::success_response($entity->save($data));
+        return success_response($entity->save($data));
     }
     public function update(int $id, Request $request, EvaAttributeOptionEntity $entity): Response
     {
-        return Helper::success_response($entity->update($request->post(), ['id' => $id]));
+        return success_response($entity->update($request->post(), ['id' => $id]));
     }
     public function delete(int $id, EvaAttributeOptionEntity $entity): Response
     {
-        return Helper::success_response($entity->destroy($id));
+        return success_response($entity->destroy($id));
     }
 }

src/Controller/EntityAttributeController.php

@@ -2,17 +2,18 @@
 declare(strict_types=1);
 namespace SixShop\Eav\Controller;
 
-use SixShop\Core\Helper;
 use SixShop\Core\Request;
 use SixShop\Eav\Entity\EvaAttributeEntity;
 use think\Response;
 
+use function SixShop\Core\success_response;
+
 class EntityAttributeController
 {
     public function index(Request $request, EvaAttributeEntity $entity): Response
     {
         $entityTypeID = $request->get('entity_type_id/d');
-        return Helper::success_response($entity->where('entity_type_id', $entityTypeID)->select());
+        return success_response($entity->where('entity_type_id', $entityTypeID)->select());
     }
 
     public function save(Request $request, EvaAttributeEntity $entity): Response
@@ -26,17 +27,17 @@ class EntityAttributeController
             $entityObject->restore();
             $data['id'] = $entityObject['id'];
         }
-        return Helper::success_response($entityObject->save($data));
+        return success_response($entityObject->save($data));
     }
 
     public function update(int $id, Request $request, EvaAttributeEntity $entity): Response
     {
         $data = $request->post();
-        return Helper::success_response($entity->where('id', $id)->update($data));
+        return success_response($entity->where('id', $id)->update($data));
     }
 
     public function delete(int $id, EvaAttributeEntity $entity): Response
     {
-        return Helper::success_response($entity->destroy($id));
+        return success_response($entity->destroy($id));
     }
 }

src/Controller/EntityTypeController.php

@@ -2,21 +2,22 @@
 declare(strict_types=1);
 namespace SixShop\Eav\Controller;
 
-use SixShop\Core\Helper;
 use SixShop\Core\Request;
 use SixShop\Eav\Entity\EvaEntityTypeEntity;
 use think\Response;
 
+use function SixShop\Core\success_response;
+
 class EntityTypeController
 {
     public function index(EvaEntityTypeEntity $entityTypeEntity): Response
     {
-        return Helper::success_response($entityTypeEntity->select());
+        return success_response($entityTypeEntity->select());
     }
 
     public function read(int $id, EvaEntityTypeEntity $entity): Response
     {
-        return Helper::success_response($entity->find($id));
+        return success_response($entity->find($id));
     }
     public function save(Request $request, EvaEntityTypeEntity $entity): Response
     {
@@ -28,15 +29,15 @@ class EntityTypeController
             $entityObject->restore();
             $data['id'] = $entityObject['id'];
         }
-        return Helper::success_response($entityObject->save($data));
+        return success_response($entityObject->save($data));
     }
 
     public function update(int $id, Request $request, EvaEntityTypeEntity $entity): Response
     {
-        return Helper::success_response($entity->update($request->post(), ['id' => $id]));
+        return success_response($entity->update($request->post(), ['id' => $id]));
     }
     public function delete(int $id, EvaEntityTypeEntity $entity): Response
     {
-        return Helper::success_response($entity->destroy($id));
+        return success_response($entity->destroy($id));
     }
 }

src/Controller/ValueController.php

@@ -3,30 +3,31 @@ declare(strict_types=1);
 
 namespace SixShop\Eav\Controller;
 
-use SixShop\Core\Helper;
 use SixShop\Core\Request;
 use SixShop\Eav\Entity\EvaValueEntity;
 use SixShop\Eav\Model\EvaAttributeModel;
 use think\Response;
 
+use function SixShop\Core\error_response;
+use function SixShop\Core\success_response;
+
 class ValueController
 {
     /**
      * 查询指定实体的所有属性值
-     * GET /eav/value?entity_type_id=1&entity_id=123
+     * GET /eav/value?entity_id=123
      */
     public function index(Request $request, EvaValueEntity $entity): Response
     {
-        $entityTypeId = $request->get('entity_type_id/d');
         $entityId = $request->get('entity_id/d');
-        if (!$entityTypeId || !$entityId) {
-            return Helper::error_response('参数缺失');
+        if (!$entityId) {
+            return error_response('缺少实体ID');
         }
         // 查询该实体的所有属性值
         $list = $entity->where([
             'entity_id' => $entityId
         ])->select();
-        return Helper::success_response($list);
+        return success_response($list);
     }
 
     /**
@@ -40,7 +41,7 @@ class ValueController
     {
         $data = $request->post();
         if (empty($data) || !is_array($data)) {
-            return Helper::error_response('参数错误');
+            return error_response('参数错误');
         }
         // 支持批量写入
         foreach ($data as $item) {
@@ -85,7 +86,7 @@ class ValueController
                 $entity->save($saveData);
             }
         }
-        return Helper::success_response('保存成功');
+        return success_response('保存成功');
     }
 
     /**
@@ -96,9 +97,9 @@ class ValueController
     {
         $entityId = $request->get('entity_id/d');
         if (!$entityId) {
-            return Helper::error_response('参数缺失');
+            return error_response('参数缺失');
         }
         $entity->where(['entity_id' => $entityId])->delete();
-        return Helper::success_response('删除成功');
+        return success_response('删除成功');
     }
 }