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

This commit is contained in:
old burden 2026-04-21 14:50:14 +08:00
parent 20a063d6aa
commit 0385ac9640
5 changed files with 339 additions and 172 deletions

View File

@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询团队(部门)充值退款订单列表
export function listGroupChargeOrder(query) {
return request({
url: '/ai/group/chargeorder/list',
method: 'get',
params: query
})
}
// 查询团队(部门)充值退款订单详细
export function getGroupChargeOrder(id) {
return request({
url: '/ai/group/chargeorder/' + id,
method: 'get'
})
}
// 新增团队(部门)充值退款订单
export function addGroupChargeOrder(data) {
return request({
url: '/ai/group/chargeorder',
method: 'post',
data: data
})
}
// 修改团队(部门)充值退款订单
export function updateGroupChargeOrder(data) {
return request({
url: '/ai/group/chargeorder',
method: 'put',
data: data
})
}
// 删除团队(部门)充值退款订单
export function delGroupChargeOrder(id) {
return request({
url: '/ai/group/chargeorder/' + id,
method: 'delete'
})
}

View File

@ -1,37 +1,18 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="订单号" prop="relationOrderNo">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="88px">
<el-form-item label="团队名称" prop="deptName">
<el-input
v-model="queryParams.relationOrderNo"
placeholder="请输入关联(充值/退款)订单号"
v-model="queryParams.deptName"
placeholder="支持模糊搜索"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="部门ID" prop="deptId">
<el-input
v-model="queryParams.deptId"
placeholder="请输入部门ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="变更金额" prop="changeAmount">
<el-input
v-model="queryParams.changeAmount"
placeholder="请输入变更金额"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="变更后金额" prop="resultAmount">
<el-input
v-model="queryParams.resultAmount"
placeholder="请输入变更后金额"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="类型" prop="orderType">
<el-select v-model="queryParams.orderType" placeholder="全部" clearable style="width: 140px">
<el-option v-for="item in orderTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@ -40,38 +21,7 @@
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['ai:record:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['ai:record:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['ai:record:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
@ -79,39 +29,29 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['ai:record:export']"
v-hasPermi="['ai:order:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" />
<el-table-column label="订单号" align="center" prop="relationOrderNo" />
<el-table-column label="部门ID" align="center" prop="deptId" />
<el-table-column label="操作类型" align="center" prop="type" />
<el-table-column label="变更金额" align="center" prop="changeAmount" />
<el-table-column label="变更后金额" align="center" prop="resultAmount" />
<el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="ID" align="center" prop="id" width="72" />
<el-table-column label="团队名称" align="center" prop="deptName" min-width="120" show-overflow-tooltip />
<el-table-column label="类型" align="center" width="100">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['ai:record:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['ai:record:remove']"
>删除</el-button>
<span>{{ orderTypeLabel(scope.row.orderType) }}</span>
</template>
</el-table-column>
<el-table-column label="金额(元)" align="center" prop="money" width="100" />
<el-table-column label="积分" align="center" prop="amount" width="100" />
<el-table-column label="时间" align="center" prop="createTime" width="160">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="140" show-overflow-tooltip />
</el-table>
<pagination
@ -122,23 +62,34 @@
@pagination="getList"
/>
<!-- 添加或修改团队部门余额变动对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="订单号" prop="relationOrderNo">
<el-input v-model="form.relationOrderNo" placeholder="请输入关联(充值/退款)订单号" />
<el-dialog :title="title" :visible.sync="open" width="560px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="团队ID" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入团队ID" />
</el-form-item>
<el-form-item label="部门ID" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入部门ID" />
<el-form-item label="类型" prop="orderType">
<el-select v-model="form.orderType" placeholder="请选择" style="width: 100%">
<el-option v-for="item in orderTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="变更金额" prop="changeAmount">
<el-input v-model="form.changeAmount" placeholder="请输入变更金额" />
<el-form-item label="金额(元)" prop="money">
<el-input v-model="form.money" placeholder="可选,对账用金额" />
</el-form-item>
<el-form-item label="变更后金额" prop="resultAmount">
<el-input v-model="form.resultAmount" placeholder="请输入变更后金额" />
<el-form-item label="积分" prop="amount">
<el-input v-model="form.amount" placeholder="充值/退款填正数;手动修改可填负数表示扣减" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择" style="width: 100%">
<el-option label="进行中" :value="0" />
<el-option label="已完成" :value="1" />
<el-option label="失败" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="订单编号" prop="orderNum" v-if="form.id != null">
<el-input v-model="form.orderNum" disabled />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注" />
<el-input v-model="form.remark" type="textarea" :rows="3" placeholder="对账说明、打款信息等" maxlength="500" show-word-limit />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -150,7 +101,7 @@
</template>
<script>
import { listRecord, getRecord, delRecord, addRecord, updateRecord } from "@/api/ai/record"
import { listGroupChargeOrder, getGroupChargeOrder, delGroupChargeOrder, addGroupChargeOrder, updateGroupChargeOrder } from "@/api/ai/groupChargeOrder"
export default {
name: "Record",
@ -168,7 +119,7 @@ export default {
showSearch: true,
//
total: 0,
//
//
recordList: [],
//
title: "",
@ -178,42 +129,38 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
relationOrderNo: null,
deptId: null,
type: null,
changeAmount: null,
resultAmount: null,
deptName: null,
orderType: null
},
//
form: {},
//
rules: {
deptId: [
{ required: true, message: "部门ID不能为空", trigger: "blur" }
],
type: [
{ required: true, message: "操作类型不能为空", trigger: "change" }
],
changeAmount: [
{ required: true, message: "变更金额不能为空", trigger: "blur" }
],
resultAmount: [
{ required: true, message: "变更后金额不能为空", trigger: "blur" }
],
createTime: [
{ required: true, message: "创建时间不能为空", trigger: "blur" }
],
}
deptId: [{ required: true, message: "请输入团队ID", trigger: "blur" }],
orderType: [{ required: true, message: "请选择类型", trigger: "change" }],
amount: [{ required: true, message: "请填写积分", trigger: "blur" }],
status: [{ required: true, message: "请选择状态", trigger: "change" }]
},
orderTypeOptions: [
{ label: "充值", value: 0 },
{ label: "退款", value: 1 },
{ label: "手动修改", value: 2 }
]
}
},
created() {
this.getList()
},
methods: {
/** 查询团队(部门)余额变动列表 */
orderTypeLabel(orderType) {
const n = orderType !== undefined && orderType !== null ? Number(orderType) : null
const hit = this.orderTypeOptions.find(o => o.value === n)
return hit ? hit.label : "—"
},
/** 查询团队订单列表 */
getList() {
this.loading = true
listRecord(this.queryParams).then(response => {
listGroupChargeOrder(this.queryParams).then(response => {
this.recordList = response.rows
this.total = response.total
this.loading = false
@ -228,14 +175,13 @@ export default {
reset() {
this.form = {
id: null,
relationOrderNo: null,
deptId: null,
type: null,
changeAmount: null,
resultAmount: null,
remark: null,
createTime: null,
updateTime: null
deptId: undefined,
orderType: 0,
money: undefined,
amount: undefined,
remark: undefined,
status: 1,
orderNum: undefined
}
this.resetForm("form")
},
@ -252,50 +198,52 @@ export default {
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset()
this.open = true
this.title = "添加团队(部门)余额变动"
this.title = "新增团队订单"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getRecord(id).then(response => {
const id = row.id || this.ids[0]
getGroupChargeOrder(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改团队(部门)余额变动"
this.title = "修改团队订单"
})
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateRecord(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addRecord(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
}
if (!valid) {
return
}
const payload = { ...this.form }
if (payload.id == null) {
addGroupChargeOrder(payload).then(() => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
})
} else {
updateGroupChargeOrder(payload).then(() => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
}
})
},
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除团队(部门)余额变动编号为"' + ids + '"的数据项?').then(function() {
return delRecord(ids)
this.$modal.confirm("是否确认删除所选团队订单?").then(() => {
return delGroupChargeOrder(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
@ -303,9 +251,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('ai/record/export', {
this.download("ai/group/chargeorder/export", {
...this.queryParams
}, `record_${new Date().getTime()}.xlsx`)
}, `team_orders_${new Date().getTime()}.xlsx`)
}
}
}

View File

@ -1,46 +1,140 @@
<template>
<div class="app-container">
<el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="88px">
<el-form-item label="类型" prop="orderType">
<el-select v-model="queryParams.orderType" clearable placeholder="全部">
<el-option label="充值" :value="0" /><el-option label="退款" :value="1" /><el-option label="手动修改" :value="2" />
</el-select>
<el-form-item label="团队名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="支持模糊搜索"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="订单编号" prop="orderNum">
<el-input v-model="queryParams.orderNum" clearable @keyup.enter.native="handleQuery" />
<el-form-item label="类型" prop="orderType">
<el-select v-model="queryParams.orderType" clearable placeholder="全部" style="width: 140px">
<el-option v-for="item in orderTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row class="mb8"><right-toolbar :show-search.sync="showSearch" @queryTable="getList" /></el-row>
<el-table v-loading="loading" :data="list">
<el-table-column label="ID" prop="id" width="70" />
<el-table-column label="团队" prop="deptName" min-width="100" show-overflow-tooltip />
<el-table-column label="类型" width="90">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ai:order:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate" v-hasPermi="['ai:order:edit']">修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete" v-hasPermi="['ai:order:remove']">删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-hasPermi="['ai:order:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" />
</el-row>
<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="ID" align="center" prop="id" width="70" />
<el-table-column label="团队" align="center" prop="deptName" min-width="100" show-overflow-tooltip />
<el-table-column label="类型" align="center" width="90">
<template slot-scope="s">{{ typeLabel(s.row.orderType) }}</template>
</el-table-column>
<el-table-column label="金额" prop="money" width="90" />
<el-table-column label="积分" prop="amount" width="90" />
<el-table-column label="时间" width="160"><template slot-scope="s">{{ parseTime(s.row.createTime) }}</template></el-table-column>
<el-table-column label="备注" prop="remark" min-width="120" show-overflow-tooltip />
<el-table-column label="金额" align="center" prop="money" width="90" />
<el-table-column label="积分" align="center" prop="amount" width="90" />
<el-table-column label="状态" align="center" width="90">
<template slot-scope="s">{{ statusLabel(s.row.status) }}</template>
</el-table-column>
<el-table-column label="时间" align="center" width="160">
<template slot-scope="s">{{ parseTime(s.row.createTime) }}</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" min-width="120" show-overflow-tooltip />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="140">
<template slot-scope="s">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(s.row)" v-hasPermi="['ai:order:edit']">修改</el-button>
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(s.row)" v-hasPermi="['ai:order:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
<el-dialog :title="title" :visible.sync="open" width="560px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="团队ID" prop="deptId">
<el-input v-model="form.deptId" placeholder="请输入团队ID" />
</el-form-item>
<el-form-item label="类型" prop="orderType">
<el-select v-model="form.orderType" placeholder="请选择" style="width: 100%">
<el-option v-for="item in orderTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="金额(元)" prop="money">
<el-input v-model="form.money" placeholder="可选,对账用金额" />
</el-form-item>
<el-form-item label="积分" prop="amount">
<el-input v-model="form.amount" placeholder="充值/退款填正数;手动修改可填负数表示扣减" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="form.status" placeholder="请选择" style="width: 100%">
<el-option label="进行中" :value="0" />
<el-option label="已完成" :value="1" />
<el-option label="失败" :value="2" />
</el-select>
</el-form-item>
<el-form-item label="订单编号" prop="orderNum" v-if="form.id != null">
<el-input v-model="form.orderNum" disabled />
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" :rows="3" maxlength="500" show-word-limit />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listSubteamChargeOrder } from '@/api/subteam'
import {
listGroupChargeOrder,
getGroupChargeOrder,
addGroupChargeOrder,
updateGroupChargeOrder,
delGroupChargeOrder
} from '@/api/ai/groupChargeOrder'
export default {
name: 'SubteamChargeOrder',
data() {
return {
loading: true,
ids: [],
single: true,
multiple: true,
showSearch: true,
list: [],
total: 0,
queryParams: { pageNum: 1, pageSize: 10, orderType: undefined, orderNum: undefined }
title: '',
open: false,
orderTypeOptions: [
{ label: '充值', value: 0 },
{ label: '退款', value: 1 },
{ label: '手动修改', value: 2 }
],
queryParams: { pageNum: 1, pageSize: 10, deptName: undefined, orderType: undefined },
form: {},
rules: {
deptId: [{ required: true, message: '请输入团队ID', trigger: 'blur' }],
orderType: [{ required: true, message: '请选择类型', trigger: 'change' }],
amount: [{ required: true, message: '请填写积分', trigger: 'blur' }],
status: [{ required: true, message: '请选择状态', trigger: 'change' }]
}
}
},
created() { this.getList() },
@ -49,16 +143,91 @@ export default {
const m = { 0: '充值', 1: '退款', 2: '手动修改' }
return m[t] != null ? m[t] : '—'
},
statusLabel(s) {
const m = { 0: '进行中', 1: '已完成', 2: '失败' }
return m[s] != null ? m[s] : '—'
},
getList() {
this.loading = true
listSubteamChargeOrder(this.queryParams).then(res => {
listGroupChargeOrder(this.queryParams).then(res => {
this.list = res.rows
this.total = res.total
this.loading = false
})
},
reset() {
this.form = {
id: null,
deptId: undefined,
orderType: 0,
money: undefined,
amount: undefined,
remark: undefined,
status: 1,
orderNum: undefined
}
this.resetForm('form')
},
cancel() {
this.open = false
this.reset()
},
handleQuery() { this.queryParams.pageNum = 1; this.getList() },
resetQuery() { this.resetForm('queryForm'); this.handleQuery() }
resetQuery() { this.resetForm('queryForm'); this.handleQuery() },
handleSelectionChange(selection) {
this.ids = selection.map(item => item.id)
this.single = selection.length !== 1
this.multiple = !selection.length
},
handleAdd() {
this.reset()
this.open = true
this.title = '新增团队订单'
},
handleUpdate(row) {
this.reset()
const id = row.id || this.ids[0]
getGroupChargeOrder(id).then(res => {
this.form = res.data
this.open = true
this.title = '修改团队订单'
})
},
submitForm() {
this.$refs.form.validate(valid => {
if (!valid) {
return
}
const payload = { ...this.form }
if (payload.id == null) {
addGroupChargeOrder(payload).then(() => {
this.$modal.msgSuccess('新增成功')
this.open = false
this.getList()
})
} else {
updateGroupChargeOrder(payload).then(() => {
this.$modal.msgSuccess('修改成功')
this.open = false
this.getList()
})
}
})
},
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除所选团队订单?').then(() => {
return delGroupChargeOrder(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess('删除成功')
}).catch(() => {})
},
handleExport() {
this.download('ai/group/chargeorder/export', {
...this.queryParams
}, `group_charge_order_${new Date().getTime()}.xlsx`)
}
}
}
</script>

View File

@ -28,7 +28,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
* @date 2026-04-17
*/
@RestController
@RequestMapping("/ai/order")
@RequestMapping("/ai/group/chargeorder")
public class AiChargeRefundOrderController extends BaseController
{
@Autowired

View File

@ -194,4 +194,10 @@ insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame
values('团队(部门)对应火山引擎配置导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', 'ai:config:export', '#', 'admin', sysdate(), '', null, '');
ALTER TABLE `byteai`.`ai_balance_change_record`
ADD COLUMN `dept_id` bigint NULL COMMENT '部门ID' AFTER `remark`;
ADD COLUMN `dept_id` bigint NULL COMMENT '部门ID' AFTER `remark`;
ALTER TABLE `byteai`.`ai_dept_ark_config`
ADD COLUMN `remark` varchar(255) NULL AFTER `update_time`;
ALTER TABLE `byteai`.`ai_video_report_data`
ADD COLUMN `recharge_score` decimal(14, 2) NULL AFTER `user_id`;