修复商福通接口问题 & 新增套餐统一查询接口

docs/api.yaml

@@ -506,6 +506,37 @@ components:
         - mode
         - quota
 
+    PageResourceRequest:
+      allOf:
+        - $ref: "#/components/schemas/PageRequest"
+        - type: object
+          properties:
+            resource_no:
+              type: string
+            active:
+              type: boolean
+            resource_type:
+              type: integer
+              description: 1=短效动态，2=长效动态
+            type:
+              type: integer
+              description: 1=包时，2=包量
+            create_after:
+              type: string
+              format: date-time
+            create_before:
+              type: string
+              format: date-time
+            expire_after:
+              type: string
+              format: date-time
+            expire_before:
+              type: string
+              format: date-time
+            status:
+              type: integer
+              description: 0=全部，1=有效，2=过期
+
     PageResourceShortRequest:
       allOf:
         - $ref: "#/components/schemas/PageRequest"
@@ -1440,6 +1471,32 @@ components:
       required:
         - id
 
+    PageResourceByAdminRequest:
+      allOf:
+        - $ref: "#/components/schemas/PageRequest"
+        - type: object
+          properties:
+            user_phone:
+              type: string
+            resource_no:
+              type: string
+            active:
+              type: boolean
+            resource_type:
+              type: integer
+              description: 1=短效动态，2=长效动态
+            mode:
+              type: integer
+              description: 1=包时，2=包量
+            created_at_start:
+              type: string
+              format: date-time
+            created_at_end:
+              type: string
+              format: date-time
+            expired:
+              type: boolean
+
     PageResourceShortByAdminRequest:
       allOf:
         - $ref: "#/components/schemas/PageRequest"
@@ -1484,6 +1541,34 @@ components:
             expired:
               type: boolean
 
+    PageResourceOfUserByAdminRequest:
+      allOf:
+        - $ref: "#/components/schemas/PageRequest"
+        - type: object
+          properties:
+            user_id:
+              type: integer
+            resource_no:
+              type: string
+            active:
+              type: boolean
+            resource_type:
+              type: integer
+              description: 1=短效动态，2=长效动态
+            mode:
+              type: integer
+              description: 1=包时，2=包量
+            created_at_start:
+              type: string
+              format: date-time
+            created_at_end:
+              type: string
+              format: date-time
+            expired:
+              type: boolean
+          required:
+            - user_id
+
     PageResourceShortOfUserByAdminRequest:
       allOf:
         - $ref: "#/components/schemas/PageRequest"
@@ -2589,6 +2674,11 @@ components:
             long:
               $ref: "#/components/schemas/ResourceLongAdminInfo"
 
+    ResourceAdminItem:
+      oneOf:
+        - $ref: "#/components/schemas/ResourceShortAdminItem"
+        - $ref: "#/components/schemas/ResourceLongAdminItem"
+
     ChannelUserItem:
       allOf:
         - $ref: "#/components/schemas/BaseModel"
@@ -3064,6 +3154,18 @@ components:
           required:
             - list
 
+    PageResourceResponse:
+      allOf:
+        - $ref: "#/components/schemas/PageMeta"
+        - type: object
+          properties:
+            list:
+              type: array
+              items:
+                $ref: "#/components/schemas/ResourceAllItem"
+          required:
+            - list
+
     PageResourceShortResponse:
       allOf:
         - $ref: "#/components/schemas/PageMeta"
@@ -3220,6 +3322,18 @@ components:
           required:
             - list
 
+    PageResourceAdminResponse:
+      allOf:
+        - $ref: "#/components/schemas/PageMeta"
+        - type: object
+          properties:
+            list:
+              type: array
+              items:
+                $ref: "#/components/schemas/ResourceAdminItem"
+          required:
+            - list
+
     PageResourceShortAdminResponse:
       allOf:
         - $ref: "#/components/schemas/PageMeta"
@@ -3911,6 +4025,27 @@ paths:
         default:
           $ref: "#/components/responses/PlainTextError"
 
+  /api/resource/list:
+    post:
+      tags: [user/resource]
+      summary: 分页查询当前用户长短效套餐
+      security:
+        - bearerAuth: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/PageResourceRequest"
+      responses:
+        "200":
+          description: 分页结果
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/PageResourceResponse"
+        default:
+          $ref: "#/components/responses/PlainTextError"
+
   /api/resource/list/short:
     post:
       tags: [user/resource]
@@ -4709,6 +4844,48 @@ paths:
         default:
           $ref: "#/components/responses/PlainTextError"
 
+  /api/admin/resource/page:
+    post:
+      tags: [admin/resource]
+      summary: 分页查询全部长短效套餐
+      security:
+        - bearerAuth: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/PageResourceByAdminRequest"
+      responses:
+        "200":
+          description: 分页结果
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/PageResourceAdminResponse"
+        default:
+          $ref: "#/components/responses/PlainTextError"
+
+  /api/admin/resource/page/of-user:
+    post:
+      tags: [admin/resource]
+      summary: 分页查询指定用户长短效套餐
+      security:
+        - bearerAuth: []
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/PageResourceOfUserByAdminRequest"
+      responses:
+        "200":
+          description: 分页结果
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/PageResourceAdminResponse"
+        default:
+          $ref: "#/components/responses/PlainTextError"
+
   /api/admin/resource/short/page:
     post:
       tags: [admin/resource]