fix：充值订单和业务订单bug修复

admin-ui/src/api/ai/order.js

@@ -3,7 +3,16 @@ import request from '@/utils/request'
 // 查询团队（部门）充值退款订单列表
 export function listOrder(query) {
   return request({
-    url: '/ai/order/list',
+    url: '/ai/video/order/',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询当前用户所属部门的视频订单列表
+export function listGroupOrder(query) {
+  return request({
+    url: '/ai/video/order/group/',
     method: 'get',
     params: query
   })
@@ -12,7 +21,7 @@ export function listOrder(query) {
 // 查询团队（部门）充值退款订单详细（只读）
 export function getOrder(id) {
   return request({
-    url: '/ai/order/' + id,
+    url: '/ai/video/order/' + id,
     method: 'get'
   })
 }

admin-ui/src/views/ai/order/index.vue

@@ -28,7 +28,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['ai:order:export']"
+          v-hasPermi="['/ai/video/order/']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -75,7 +75,10 @@ export default {
       orderList: [],
       orderTypeOptions: [
         { label: "充值", value: 0 },
-        { label: "退款", value: 1 }
+        { label: "退款", value: 1 },
+        { label: "下发", value: 2 },
+        { label: "回收", value: 3 },
+        { label: "手动修改", value: 4 }
       ],
       queryParams: {
         pageNum: 1,
@@ -111,7 +114,7 @@ export default {
       this.handleQuery()
     },
     handleExport() {
-      this.download("ai/order/export", { ...this.queryParams }, `team_orders_${new Date().getTime()}.xlsx`)
+      this.download("ai/video/order/export", { ...this.queryParams }, `team_orders_${new Date().getTime()}.xlsx`)
     }
   }
 }

admin-ui/src/views/subteam/groupBalance/index.vue

@@ -2,7 +2,9 @@
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true">
       <el-form-item label="类型" prop="type">
-        <el-input v-model="queryParams.type" clearable placeholder="0-4" @keyup.enter.native="handleQuery" />
+        <el-select v-model="queryParams.type" clearable placeholder="全部类型" style="width: 180px">
+          <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="关联单号" prop="relationOrderNo">
         <el-input v-model="queryParams.relationOrderNo" clearable @keyup.enter.native="handleQuery" />
@@ -16,7 +18,11 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column label="ID" prop="id" width="80" />
       <el-table-column label="关联单号" prop="relationOrderNo" min-width="120" show-overflow-tooltip />
-      <el-table-column label="类型" prop="type" width="80" />
+      <el-table-column label="类型" width="100">
+        <template slot-scope="s">
+          <span>{{ typeLabel(s.row.type) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="变更金额" prop="changeAmount" width="100" />
       <el-table-column label="变更后" prop="resultAmount" width="100" />
       <el-table-column label="时间" width="160"><template slot-scope="s">{{ parseTime(s.row.createTime) }}</template></el-table-column>
@@ -35,11 +41,23 @@ export default {
       showSearch: true,
       list: [],
       total: 0,
+      typeOptions: [
+        { label: '充值', value: 0 },
+        { label: '退款', value: 1 },
+        { label: '下发', value: 2 },
+        { label: '回收', value: 3 },
+        { label: '手动修改', value: 4 }
+      ],
       queryParams: { pageNum: 1, pageSize: 10, type: undefined, relationOrderNo: undefined }
     }
   },
   created() { this.getList() },
   methods: {
+    typeLabel(type) {
+      const n = type !== undefined && type !== null ? Number(type) : null
+      const hit = this.typeOptions.find(item => item.value === n)
+      return hit ? hit.label : '-'
+    },
     getList() {
       this.loading = true
       listSubteamGroupBalance(this.queryParams).then(res => {

admin-ui/src/views/subteam/videoOrder/index.vue

@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import { listSubteamVideoOrder } from '@/api/subteam'
+import { listGroupOrder } from '@/api/ai/order'
 export default {
   name: 'SubteamVideoOrder',
   data() {
@@ -79,7 +79,7 @@ export default {
   methods: {
     getList() {
       this.loading = true
-      listSubteamVideoOrder(this.queryParams).then(res => {
+      listGroupOrder(this.queryParams).then(res => {
         this.list = res.rows
         this.total = res.total
         this.loading = false

web-api/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ai/AiOrderController.java

@@ -33,8 +33,8 @@ public class AiOrderController extends BaseController
     /**
      * 查询订单管理列表
      */
-    @PreAuthorize("@ss.hasPermi('ai:order:list')")
+    @PreAuthorize("@ss.hasPermi('/ai/video/order/')")
-    @GetMapping("/list")
+    @GetMapping({"", "/", "/list"})
     public TableDataInfo list(AiOrder aiOrder)
     {
         startPage();
@@ -42,10 +42,23 @@ public class AiOrderController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询当前用户所属部门的订单列表
+     */
+    @PreAuthorize("@ss.hasPermi('/ai/video/order/group/')")
+    @GetMapping({"/group", "/group/", "/group/list"})
+    public TableDataInfo groupList(AiOrder aiOrder)
+    {
+        aiOrder.setDeptId(SecurityUtils.getDeptId());
+        startPage();
+        List<AiOrder> list = aiOrderService.selectAiOrderList(aiOrder);
+        return getDataTable(list);
+    }
+
     /**
      * 导出订单管理列表
      */
-    @PreAuthorize("@ss.hasPermi('ai:order:export')")
+    @PreAuthorize("@ss.hasPermi('/ai/video/order/')")
     @Log(title = "订单管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, AiOrder aiOrder)