规范化修改

Signed-off-by: houhezheng <houhezheng@romens.cn>

backend/controllers/v1/authority/AuthorityNodeController.php

@@ -6,10 +6,10 @@ use app\models\v1\rbacuser\ShopRbacUser;
 use backend\controllers\v1\BaseController;
 use Yii;
 use yii\web\BadRequestHttpException;
-use yii\web\HttpException;
 use yii\web\ServerErrorHttpException;
 use app\models\v1\rbacuser\ShopRbacRoleAccess;
 use app\models\v1\rbacuser\ShopRbacRole;
+use backend\helpers\Func;
 use yii\data\ActiveDataProvider;
 
 class AuthorityNodeController extends BaseController
@@ -148,7 +148,7 @@ class AuthorityNodeController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=201,
      *         description="添加成功",
      *     ),
      *     @OA\Response(
@@ -176,7 +176,7 @@ class AuthorityNodeController extends BaseController
             return $model->errors;
         }
 
-        throw new HttpException(200, '添加成功！');
+        return Func::returnResult(201, '添加成功！');
     }
 
     /**
@@ -217,7 +217,7 @@ class AuthorityNodeController extends BaseController
             throw new ServerErrorHttpException('删除失败！');
         }
 
-        throw new HttpException(200, "删除成功！");
+        return Func::returnResult(204, "删除成功！");
     }
 
     /**
@@ -261,13 +261,13 @@ class AuthorityNodeController extends BaseController
     {
         $id = Yii::$app->request->get('ID');
         $model = new $this->modelClass();
-        $info[] = $model->findOne($id)->toArray();
+        $info = $model->findOne($id);
         if (!$info) {
             throw new BadRequestHttpException('不存在的节点！');
         }
 
         return new ActiveDataProvider([
-            'models' => $info,
+            'models' => $info->toArray(),
             'pagination' => false
         ]);
     }
@@ -317,7 +317,7 @@ class AuthorityNodeController extends BaseController
         if (!$_model) {
             throw new BadRequestHttpException("不存在此节点！");
         }
-        //过滤掉部分为空的参数
+        //过滤掉部分为空的参数,防止不为空字段被置空，更新出错。
         foreach ($params as $key => $value) {
             if (in_array($key, ['TITLE', 'STATUS', 'IS_MENU', 'IS_TOP_MENU', 'IS_DEFAULT_SHOW', 'SORT', 'PID', 'LEVEL']) && (empty(trim($value)) && $value != '0')) {
                 unset($params[$key]);
@@ -330,7 +330,7 @@ class AuthorityNodeController extends BaseController
             return $_model->errors;
         }
 
-        throw new HttpException(200, '更新成功！');
+        return Func::returnResult(200, '更新成功！');
     }
 
     /**

backend/controllers/v1/branch/BranchScoreController.php

@@ -13,7 +13,6 @@ use app\models\v1\rbacuser\ShopRbacUser;
 use backend\helpers\UploadFiles;
 use yii\web\UploadedFile;
 use yidas\phpSpreadsheet\Helper;
-use yii\web\HttpException;
 
 class BranchScoreController extends BaseController
 {
@@ -199,7 +198,7 @@ class BranchScoreController extends BaseController
             return $model->errors;
         }
 
-        throw new HttpException(200, "更新成功！");
+        return Func::returnResult(200, "更新成功！");
     }
 
     /**
@@ -218,7 +217,7 @@ class BranchScoreController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=204,
      *         description="删除成功！"
      *     ),
      *     @OA\Response(
@@ -244,7 +243,7 @@ class BranchScoreController extends BaseController
             throw new ServerErrorHttpException('删除失败！');
         }
 
-        throw new HttpException(200, "删除成功！");
+        return Func::returnResult(204, "删除成功！");
     }
 
     /**
@@ -325,7 +324,7 @@ class BranchScoreController extends BaseController
             return $model->errors;
         }
 
-        throw new HttpException(200, "保存成功！");
+        return Func::returnResult(200, "保存成功！");
     }
 
     /**
@@ -458,7 +457,7 @@ class BranchScoreController extends BaseController
                 }
                 $transaction->commit();
                 @unlink($fileInfo['INFO'][0]);
-                throw new HttpException("200", '导入成功');
+                return Func::returnResult(200, '导入成功');
             } catch (\Throwable $th) {
                 $transaction->rollBack();
                 @unlink($fileInfo['INFO'][0]);

backend/controllers/v1/shopgoods/GoodsDetailSettingController.php

@@ -5,11 +5,11 @@ namespace backend\controllers\v1\shopgoods;
 use app\models\v1\shopgoods\ShopGoods;
 use Yii;
 use backend\controllers\v1\BaseController;
+use backend\helpers\Func;
 use backend\helpers\UploadFiles;
 use yidas\phpSpreadsheet\Helper;
 use yii\data\ActiveDataProvider;
 use yii\web\BadRequestHttpException;
-use yii\web\HttpException;
 use yii\web\ServerErrorHttpException;
 use yii\web\UploadedFile;
 
@@ -80,13 +80,13 @@ class GoodsDetailSettingController extends BaseController
     {
         $guid = Yii::$app->request->get('GUID');
         $model = new $this->modelClass();
-        $info[] = $model::findOne($guid)->toArray();
+        $info = $model::findOne($guid);
         if (!$info) {
             throw new BadRequestHttpException('不存在该模板！');
         }
 
         return new ActiveDataProvider([
-            'models' => $info,
+            'models' => $info->toArray(),
             'pagination' => false
         ]);
     }
@@ -153,7 +153,7 @@ class GoodsDetailSettingController extends BaseController
             Yii::$app->response->statusCode = 422;
             return $_model->errors;
         }
-        throw new HttpException(200, '更新成功');
+        return Func::returnResult(200, '更新成功');
     }
 
     /**
@@ -180,7 +180,7 @@ class GoodsDetailSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=201,
      *         description="保存成功！"
      *     ),
      *     @OA\Response(
@@ -203,7 +203,7 @@ class GoodsDetailSettingController extends BaseController
             Yii::$app->response->statusCode = 422;
             return $model->errors;
         }
-        throw new HttpException(200, '创建成功');
+        return Func::returnResult(201, '创建成功');
     }
 
     /**
@@ -222,7 +222,7 @@ class GoodsDetailSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=204,
      *         description="删除成功！"
      *     ),
      *     @OA\Response(
@@ -247,7 +247,7 @@ class GoodsDetailSettingController extends BaseController
         if (!$_model->delete()) {
             throw new ServerErrorHttpException('删除失败！');
         }
-        throw new HttpException(200, "删除成功！");
+        return Func::returnResult(204, "删除成功！");
     }
 
     /**
@@ -275,7 +275,7 @@ class GoodsDetailSettingController extends BaseController
     {
         $params = Yii::$app->request->queryParams;
         $associatedGoods = (new ShopGoods)->associatedGoods($params);
-        if (!$associatedGoods) {
+        if (!$associatedGoods->getModels()) {
             throw new BadRequestHttpException('未找到符合条件的数据');
         }
         return $associatedGoods;
@@ -300,7 +300,7 @@ class GoodsDetailSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=201,
      *         description="添加成功"
      *     ),
      *     @OA\Response(
@@ -318,7 +318,7 @@ class GoodsDetailSettingController extends BaseController
         if (!$res) {
             throw new ServerErrorHttpException('添加失败');
         }
-        throw new HttpException(200, '添加成功');
+        return Func::returnResult(201, '添加成功');
     }
 
     /**
@@ -337,7 +337,7 @@ class GoodsDetailSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=204,
      *         description="删除成功！"
      *     ),
      *    @OA\Response(
@@ -358,7 +358,7 @@ class GoodsDetailSettingController extends BaseController
         if ($goodsInfo->save(false)) {
             throw new ServerErrorHttpException('删除失败');
         }
-        throw new HttpException(200, '删除成功');
+        return Func::returnResult(204, '删除成功');
     }
 
     /**
@@ -428,7 +428,7 @@ class GoodsDetailSettingController extends BaseController
                 }
                 $transaction->commit();
                 @unlink($fileInfo['INFO'][0]);
-                throw new HttpException("200", '导入成功');
+                return Func::returnResult(200, '导入成功');
             } catch (\Throwable $th) {
                 $transaction->rollBack();
                 @unlink($fileInfo['INFO'][0]);

backend/controllers/v1/shopuser/ShopEmployeeController.php

@@ -11,7 +11,6 @@ use backend\helpers\UploadFiles;
 use yidas\phpSpreadsheet\Helper;
 use yii\web\UploadedFile;
 use yii\web\BadRequestHttpException;
-use yii\web\HttpException;
 
 class ShopEmployeeController extends BaseController
 {
@@ -193,7 +192,7 @@ class ShopEmployeeController extends BaseController
                 }
                 $transcation->commit();
                 @unlink($fileInfo['INFO'][0]);
-                throw new HttpException(200, "导入成功！");
+                return Func::returnResult(200, "导入成功！");
             } catch (\Throwable $th) {
                 $transcation->rollBack();
                 @unlink($fileInfo['INFO'][0]);
@@ -231,7 +230,7 @@ class ShopEmployeeController extends BaseController
      *             )
      *         )
      *     ),
-     *     @OA\Response(response=200,description="添加成功！"),
+     *     @OA\Response(response=201,description="添加成功！"),
      *     @OA\Response(response=422,description="数据验证失败，返回错误信息(数组)"),
      *     security={{"Authorization":{}}}
      * )
@@ -271,7 +270,7 @@ class ShopEmployeeController extends BaseController
             Yii::$app->response->statusCode = 422;
             return $model->errors;
         }
-        throw new HttpException(200, '添加成功！');
+        return Func::returnResult(201, '添加成功！');
     }
 
     /**
@@ -333,7 +332,7 @@ class ShopEmployeeController extends BaseController
             Yii::$app->response->statusCode = 422;
             return $_model->errors;
         }
-        throw new HttpException(200, '更新成功！');
+        return Func::returnResult(200, '更新成功！');
     }
 
     /**
@@ -352,7 +351,7 @@ class ShopEmployeeController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=204,
      *         description="删除成功！"
      *     ),
      *     security={{"Authorization":{}}}
@@ -378,6 +377,6 @@ class ShopEmployeeController extends BaseController
             Yii::$app->response->statusCode = 422;
             return $_model->errors;
         }
-        throw new HttpException(200, '删除成功！');
+        return Func::returnResult(204, '删除成功！');
     }
 }

backend/controllers/v1/transport/TransportSettingController.php

@@ -114,7 +114,7 @@ class TransportSettingController extends BaseController
         }
 
         $transportBranches = (new ShopPackagingcostsBranches)->transportBranches($model->GUID);
-        $info[0]['BRANCHES_INFO'] = $transportBranches;  //指定省级
+        $info['BRANCHES_INFO'] = $transportBranches;  //指定省级
         $dataProvider->setModels($info);
         return $dataProvider;
     }
@@ -230,7 +230,7 @@ class TransportSettingController extends BaseController
                 return $_model->errors;
             }
         }
-        throw new HttpException(200, "更新成功！");
+        return Func::returnResult(200, "更新成功！");
     }
 
     /**
@@ -292,7 +292,7 @@ class TransportSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=204,
      *         description="删除成功！"
      *     ),
      *     @OA\Response(
@@ -324,7 +324,7 @@ class TransportSettingController extends BaseController
             throw new ServerErrorHttpException('删除失败！');
         }
 
-        throw new HttpException(200, "删除成功！");
+        return Func::returnResult(204, "删除成功！");
     }
 
     /**
@@ -356,7 +356,7 @@ class TransportSettingController extends BaseController
      *         )
      *     ),
      *     @OA\Response(
-     *         response=200,
+     *         response=201,
      *         description="OK,保存成功"
      *     ),
      *    @OA\Response(
@@ -417,6 +417,6 @@ class TransportSettingController extends BaseController
             return $model->errors;
         }
 
-        throw new HttpException(200, "添加成功！");
+        return Func::returnResult(201, "添加成功！");
     }
 }

backend/models/v1/branch/ShopBranchScore.php

@@ -146,10 +146,12 @@ class ShopBranchScore extends BaseModel
     {
         $query = static::find()
             ->select('GUID,BRANCH_NAME,BRANCH_CODE,BASIC_SERVICES,QUALITY_ASSURANCE,OPERATION_MANAGEMENT,STORE_IMAGE,ELECTRICITY_MANAGEMENT,CUSTOMERE_VALUATION,STORE_CONFIGURATION,ARTIFICIAL_NUMBER,ARTIFICIAL_NAME')
-            ->where(['GUID' => $id]);
+            ->where(['GUID' => $id])
+            ->asArray()
+            ->one();
 
         return new ActiveDataProvider([
-            'query' => $query->asArray(),
+            'models' => $query,
             'pagination' => false
         ]);
     }

backend/models/v1/shopuser/ShopEmployee.php

@@ -156,11 +156,12 @@ class ShopEmployee extends ShopUser
         $query = static::find()->alias('su')
             ->select('su.GUID,su.NAME,su.EMPLOYEE_CODE,su.MOBILE_PHONE,su.CONTACTBIRTH_DATE,su.CONTACT_SEX,su.MEMBER_NO,su.IS_DISTRIBUTOR,su.EMPLOYEE_IS_MANAGER,sb.CODE as BRANCH_CODE')
             ->leftJoin('shop_branch sb', 'sb.GUID=su.EMPLOYEE_BRANCH_GUID')
-            ->where(['su.GUID' => $id, 'su.BELONG' => 1]);
-            
+            ->where(['su.GUID' => $id, 'su.BELONG' => 1])
+            ->one();
+        
         return new ActiveDataProvider(
             [
-                'query' => $query,
+                'models' => $query->toArray(),
                 'pagination' => false
             ]
         );

backend/models/v1/transport/TransportSetting.php

@@ -171,10 +171,11 @@ class TransportSetting extends \app\models\v1\BaseModel
     {
         $query = static::find()
             ->select(['GUID', 'TRANSPORT_TYPE', 'BASE_FEE', 'BASE_WEIGHT', 'BASE_WEIGHT_FEE', 'INCREASE_WEIGHT', 'INCREASE_WEIGHT_FEE', 'DESCRIPTION', 'SELECT_AREA', 'IS_USED', 'LIMIT_MEMBER_GROUP_GUID', 'GROUP_GUID'])
-            ->where(['GUID' => $guid]);
+            ->where(['GUID' => $guid])
+            ->one();
 
         return new ActiveDataProvider([
-            'query' => $query->asArray(),
+            'models' => $query->toArray(),
             'pagination' => false
         ]);
     }