Browse Source

feat(business): 添加道具使用记录功能并集成到用户列表页面- 新增道具使用记录相关 API 和类型定义
- 实现道具使用记录列表、详情、新增、编辑和删除功能
- 在用户列表页面添加查看积分流水按钮,跳转到道具使用记录页面- 优化用户列表页面布局和样式

fugui001 4 months ago
parent
commit
038fea291c

+ 63 - 0
src/api/system/business/itemsLog/index.ts

@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ItemsLogVO, ItemsLogForm, ItemsLogQuery } from '@/api/system/business/itemsLog/types';
+
+/**
+ * 查询道具使用记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listItemsLog = (query?: ItemsLogQuery): AxiosPromise<ItemsLogVO[]> => {
+  return request({
+    url: '/business/itemsLog/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询道具使用记录详细
+ * @param id
+ */
+export const getItemsLog = (id: string | number): AxiosPromise<ItemsLogVO> => {
+  return request({
+    url: '/business/itemsLog/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增道具使用记录
+ * @param data
+ */
+export const addItemsLog = (data: ItemsLogForm) => {
+  return request({
+    url: '/business/itemsLog',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改道具使用记录
+ * @param data
+ */
+export const updateItemsLog = (data: ItemsLogForm) => {
+  return request({
+    url: '/business/itemsLog',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除道具使用记录
+ * @param id
+ */
+export const delItemsLog = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/business/itemsLog/' + id,
+    method: 'delete'
+  });
+};

+ 150 - 0
src/api/system/business/itemsLog/types.ts

@@ -0,0 +1,150 @@
+export interface ItemsLogVO {
+  /**
+   *
+   */
+  id: string | number;
+
+  /**
+   * 道具ID
+   */
+  itermsId: string | number;
+
+  /**
+   * 现在的数量
+   */
+  scoreNum: number;
+
+  /**
+   * 原来的数量
+   */
+  afterNum: number;
+
+  /**
+   * 创建时间
+   */
+  createdAt: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt: string;
+
+  /**
+   * 用户ID
+   */
+  userId: string | number;
+
+  /**
+   * 1 新增  2 扣除 3 其他
+   */
+  type: number;
+
+  /**
+   * 描述
+   */
+  remark: string;
+
+  /**
+   * 道具获取类型   充值/奖励/报名/比赛
+   */
+  itermsType: string;
+}
+
+export interface ItemsLogForm extends BaseEntity {
+  /**
+   *
+   */
+  id?: string | number;
+
+  /**
+   * 道具ID
+   */
+  itermsId?: string | number;
+
+  /**
+   * 现在的数量
+   */
+  scoreNum?: number;
+
+  /**
+   * 原来的数量
+   */
+  afterNum?: number;
+
+  /**
+   * 创建时间
+   */
+  createdAt?: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt?: string;
+
+  /**
+   * 用户ID
+   */
+  userId?: string | number;
+
+  /**
+   * 1 新增  2 扣除 3 其他
+   */
+  type?: number;
+
+  /**
+   * 描述
+   */
+  remark?: string;
+
+  /**
+   * 道具获取类型   充值/奖励/报名/比赛
+   */
+  itermsType?: string;
+}
+
+export interface ItemsLogQuery extends PageQuery {
+  /**
+   * 道具ID
+   */
+  itermsId?: string | number;
+
+  /**
+   * 现在的数量
+   */
+  scoreNum?: number;
+
+  /**
+   * 原来的数量
+   */
+  afterNum?: number;
+
+  /**
+   * 创建时间
+   */
+  createdAt?: string;
+
+  /**
+   * 更新时间
+   */
+  updatedAt?: string;
+
+  /**
+   * 用户ID
+   */
+  userId?: string | number;
+
+  /**
+   * 1 新增  2 扣除 3 其他
+   */
+  type?: number;
+
+  /**
+   * 道具获取类型   充值/奖励/报名/比赛
+   */
+  itermsType?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}

+ 35 - 4
src/views/system/business/apiUsers/index.vue

@@ -36,7 +36,6 @@
               />
             </el-form-item>
 
-
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -93,9 +92,9 @@
         <el-table-column label="比赛数" align="center" prop="tournamentCount" />
         <el-table-column label="账号状态" align="center" prop="statusText" />
 
-        <el-table-column label="操作" align="center" width="350" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="430" class-name="small-padding fixed-width">
           <template #default="scope">
-            <div style="display: flex; justify-content: center; gap: 8px">
+            <div class="action-container">
               <el-tooltip content="查看" placement="top">
                 <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)" v-hasPermi="['business:user:edit']">查看</el-button>
               </el-tooltip>
@@ -122,6 +121,12 @@
                   >编辑道具</el-button
                 >
               </el-tooltip>
+
+              <el-tooltip content="查看流水" placement="top">
+                <el-button link type="primary" icon="View" @click="viewPointsLog(scope.row)" v-hasPermi="['business:user:edit']"
+                  >查看流水</el-button
+                >
+              </el-tooltip>
             </div>
           </template>
         </el-table-column>
@@ -204,7 +209,7 @@
     </el-dialog>
 
     <!-- 发放道具弹窗 -->
-    <el-dialog v-model="grantDialogVisible" title="发放道具" width="400px">
+    <el-dialog v-model="grantDialogVisible" title="操作道具" width="400px">
       <div class="dialog-content">
         <!-- 左侧内容 -->
         <div class="left-content">
@@ -591,4 +596,30 @@ const submitGrantForm = async () => {
     console.error(error);
   }
 };
+const router = useRouter(); // 获取 router 实例
+// 查看积分流水
+const viewPointsLog = (row: UserVO) => {
+  // 跳转到积分流水页面,并传递用户ID作为查询参数
+  router.push({
+    path: '/business/itemsLog',
+    query: {
+      userId: row.id,
+      t: Date.now() // 添加时间戳确保URL变化,触发页面刷新
+    }
+  });
+};
 </script>
+<style scoped>
+.action-container {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  min-width: 100%;
+  max-width: none;
+  overflow-x: auto;
+  overflow-y: hidden;
+  white-space: nowrap;
+  padding: 0 8px;
+}
+</style>

+ 300 - 0
src/views/system/business/itemsLog/index.vue

@@ -0,0 +1,300 @@
+<template>
+  <div class="p-2">
+<!--    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="道具ID" prop="itermsId">
+              <el-input v-model="queryParams.itermsId" placeholder="请输入道具ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="现在的数量" prop="scoreNum">
+              <el-input v-model="queryParams.scoreNum" placeholder="请输入现在的数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="原来的数量" prop="afterNum">
+              <el-input v-model="queryParams.afterNum" placeholder="请输入原来的数量" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="创建时间" prop="createdAt">
+              <el-date-picker clearable v-model="queryParams.createdAt" type="date" value-format="YYYY-MM-DD" placeholder="请选择创建时间" />
+            </el-form-item>
+            <el-form-item label="更新时间" prop="updatedAt">
+              <el-date-picker clearable v-model="queryParams.updatedAt" type="date" value-format="YYYY-MM-DD" placeholder="请选择更新时间" />
+            </el-form-item>
+            <el-form-item label="用户ID" prop="userId">
+              <el-input v-model="queryParams.userId" placeholder="请输入用户ID" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>-->
+
+    <el-card shadow="never">
+<!--      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:itemsLog:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:itemsLog:edit']"
+              >修改</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:itemsLog:remove']"
+              >删除</el-button
+            >
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:itemsLog:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>-->
+
+      <el-table v-loading="loading" border :data="itemsLogList" @selection-change="handleSelectionChange">
+        <!--        <el-table-column type="selection" width="55" align="center" />-->
+        <!-- 序号列 -->
+        <el-table-column label="序号" width="60" align="center">
+          <template #default="{ $index }">
+            {{ $index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}
+          </template>
+        </el-table-column>
+        <el-table-column label="道具名称" align="center" prop="itemName" />
+        <el-table-column label="当前操作数量" align="center" prop="scoreNum" />
+        <el-table-column label="操作类型" align="center">
+          <template #default="scope">
+            <span v-if="scope.row.type === 1">新增</span>
+            <span v-else-if="scope.row.type === 2">扣除</span>
+            <span v-else-if="scope.row.type === 3">其他</span>
+            <span v-else>未知</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作前数量" align="center" prop="beforeNum" />
+        <el-table-column label="操作后数量" align="center" prop="afterNum" />
+        <el-table-column label="描述" align="center" prop="remark" />
+        <el-table-column label="创建时间" align="center" prop="createdAt" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createdAt, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改道具使用记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="itemsLogFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="道具ID" prop="itermsId">
+          <el-input v-model="form.itermsId" placeholder="请输入道具ID" />
+        </el-form-item>
+        <el-form-item label="现在的数量" prop="scoreNum">
+          <el-input v-model="form.scoreNum" placeholder="请输入现在的数量" />
+        </el-form-item>
+        <el-form-item label="原来的数量" prop="afterNum">
+          <el-input v-model="form.afterNum" placeholder="请输入原来的数量" />
+        </el-form-item>
+        <el-form-item label="创建时间" prop="createdAt">
+          <el-date-picker clearable v-model="form.createdAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择创建时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="更新时间" prop="updatedAt">
+          <el-date-picker clearable v-model="form.updatedAt" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择更新时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="用户ID" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户ID" />
+        </el-form-item>
+        <el-form-item label="描述" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="ItemsLog" lang="ts">
+import { listItemsLog, getItemsLog, delItemsLog, addItemsLog, updateItemsLog } from '@/api/system/business/itemsLog';
+import { ItemsLogVO, ItemsLogQuery, ItemsLogForm } from '@/api/system/itemsLog/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const itemsLogList = ref<ItemsLogVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const itemsLogFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: ItemsLogForm = {
+  id: undefined,
+  itermsId: undefined,
+  scoreNum: undefined,
+  afterNum: undefined,
+  createdAt: undefined,
+  updatedAt: undefined,
+  userId: undefined,
+  type: undefined,
+  remark: undefined,
+  itermsType: undefined
+};
+const data = reactive<PageData<ItemsLogForm, ItemsLogQuery>>({
+  form: { ...initFormData },
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    itermsId: undefined,
+    scoreNum: undefined,
+    afterNum: undefined,
+    createdAt: undefined,
+    updatedAt: undefined,
+    userId: undefined,
+    type: undefined,
+    itermsType: undefined,
+    params: {}
+  },
+  rules: {
+    id: [{ required: true, message: '不能为空', trigger: 'blur' }]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询道具使用记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listItemsLog(queryParams.value);
+  itemsLogList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = { ...initFormData };
+  itemsLogFormRef.value?.resetFields();
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ItemsLogVO[]) => {
+  ids.value = selection.map((item) => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = '添加道具使用记录';
+};
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: ItemsLogVO) => {
+  reset();
+  const _id = row?.id || ids.value[0];
+  const res = await getItemsLog(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = '修改道具使用记录';
+};
+
+/** 提交按钮 */
+const submitForm = () => {
+  itemsLogFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateItemsLog(form.value).finally(() => (buttonLoading.value = false));
+      } else {
+        await addItemsLog(form.value).finally(() => (buttonLoading.value = false));
+      }
+      proxy?.$modal.msgSuccess('操作成功');
+      dialog.visible = false;
+      await getList();
+    }
+  });
+};
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: ItemsLogVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除道具使用记录编号为"' + _ids + '"的数据项?').finally(() => (loading.value = false));
+  await delItemsLog(_ids);
+  proxy?.$modal.msgSuccess('删除成功');
+  await getList();
+};
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download(
+    'system/itemsLog/export',
+    {
+      ...queryParams.value
+    },
+    `itemsLog_${new Date().getTime()}.xlsx`
+  );
+};
+
+const route = useRoute(); // 获取 route 实例
+onMounted(() => {
+  // 检查路由参数中是否有 userId
+  if (route.query.userId) {
+    // 设置查询条件中的 userId
+    queryParams.value.userId = route.query.userId as string;
+    // 自动执行查询
+    getList();
+  } else {
+    getList();
+  }
+});
+// 监听路由参数变化
+watch(
+  () => route.query,
+  (newQuery, oldQuery) => {
+    // 当查询参数发生变化时,重新加载数据
+    if (newQuery.userId) {
+      queryParams.value.userId = newQuery.userId as string;
+      // 重置分页
+      queryParams.value.pageNum = 1;
+      getList();
+    }
+  },
+  { deep: true }
+);
+</script>

+ 5 - 1
src/views/system/business/order/index.vue

@@ -86,7 +86,11 @@
             <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
           </template>
         </el-table-column>
-
+        <el-table-column label="创建时间" align="center" prop="payTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+          </template>
+        </el-table-column>
         <!--        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">