门店配送方式列表

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

backend/controllers/v1/branch/BranchController.php

@@ -273,11 +273,8 @@ class BranchController extends BaseController
      *   tags={"门店&DC"},
      *   description="门店配送方式信息",
      *   summary="门店配送方式信息(孙磊)",
-     *   @OA\Parameter(name="page",in="query",description="分页页码",@OA\Schema(type="int")),
      *   @OA\Response(response="200",description="
      *           GUID:配送方式GUID,
-     *           ORG_GUID:组织机构号,
-     *           CODE:配送方式编号,
      *           NAME:配送方式名称,
      *   "),
      *   security={{"Authorization": {}}}
@@ -287,7 +284,7 @@ class BranchController extends BaseController
     {
         $model = new ShopTransportType;
         $info = $model->BranchTransportInfo();
-        if (!$info->getModels()) {
+        if (!$info) {
             throw new BadRequestHttpException('未找到符合的门店门店配送方式');
         }
         return $info;

backend/models/v1/transport/ShopTransportType.php

@@ -79,16 +79,10 @@ class ShopTransportType extends BaseModel
     //门店-配送方式信息
     public function BranchTransportInfo()
     {
-        $query = static::find()->select('GUID,NAME,CODE')
-                               ->where(['STATE' => 1]);
+        $query = static::find()->select('GUID,NAME')
+                               ->where(['STATE' => 1])
+                               ->all();
         
-        return new ActiveDataProvider(
-            [
-                'query' => $query->asArray(),
-                'pagination' => [
-                    'pageSize' =>  15,
-                ]
-            ]
-        );
+        return $query;
     }
 }
\ No newline at end of file