diff --git a/frontend/app/web-gold/src/api/pointRecord.js b/frontend/app/web-gold/src/api/pointRecord.js index dcad154b57..965012b246 100644 --- a/frontend/app/web-gold/src/api/pointRecord.js +++ b/frontend/app/web-gold/src/api/pointRecord.js @@ -15,5 +15,5 @@ import { API_BASE } from '@gold/config/api' * @returns {Promise} */ export function getPointRecordPage(params = {}) { - return http.get(`${API_BASE.APP_MEMBER}/tik/point-record/page`, { params }) + return http.get(`${API_BASE.APP_TIK}/point-record/page`, { params }) } diff --git a/frontend/app/web-gold/src/views/user/Profile.vue b/frontend/app/web-gold/src/views/user/Profile.vue index 2a7f0c4da0..c6ca4e5f5d 100644 --- a/frontend/app/web-gold/src/views/user/Profile.vue +++ b/frontend/app/web-gold/src/views/user/Profile.vue @@ -66,13 +66,14 @@ function maskMobile(mobile) { return mobile.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2') } -// 获取积分记录 +// 获取积分记录(只显示已完成的记录) async function fetchPointRecords() { recordsLoading.value = true try { const res = await getPointRecordPage({ pageNo: recordsPagination.current, - pageSize: recordsPagination.pageSize + pageSize: recordsPagination.pageSize, + status: 'confirmed' }) if (res.data) { pointRecords.value = res.data.list || [] @@ -86,9 +87,9 @@ async function fetchPointRecords() { } // 分页变化 -function handleTableChange(pagination) { - recordsPagination.current = pagination.current - recordsPagination.pageSize = pagination.pageSize +function handleTableChange(page, pageSize) { + recordsPagination.current = page + recordsPagination.pageSize = pageSize fetchPointRecords() } @@ -112,7 +113,11 @@ function getBizTypeName(bizType) { 'exchange': '兑换', 'admin': '后台调整', 'gift': '礼包赠送', - 'digital_human': '数字人生成' + 'dify_chat': 'AI文案', + 'digital_human': '数字人', + 'voice_tts': '语音克隆', + 'tikhub_fetch': '数据采集', + 'forecast_rewrite': '文案改写' } return typeMap[bizType] || bizType || '其他' } @@ -258,16 +263,12 @@ onMounted(async () => { diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/mapper/PointRecordMapper.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/mapper/PointRecordMapper.java index 0987cc9372..d40dd8c827 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/mapper/PointRecordMapper.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/mapper/PointRecordMapper.java @@ -29,6 +29,7 @@ public interface PointRecordMapper extends BaseMapperX { .eqIfPresent(PointRecordDO::getBizType, reqVO.getBizType()) .eqIfPresent(PointRecordDO::getBizId, reqVO.getBizId()) .eqIfPresent(PointRecordDO::getRemark, reqVO.getRemark()) + .eqIfPresent(PointRecordDO::getStatus, reqVO.getStatus()) .betweenIfPresent(PointRecordDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(PointRecordDO::getId)); } diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/vo/PointRecordPageReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/vo/PointRecordPageReqVO.java index 17c6567cae..6368c01058 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/vo/PointRecordPageReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/muye/pointrecord/vo/PointRecordPageReqVO.java @@ -40,6 +40,9 @@ public class PointRecordPageReqVO extends PageParam { @Schema(description = "备注", example = "你猜") private String remark; + @Schema(description = "状态:pending-预扣 confirmed-已确认 canceled-已取消") + private String status; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime;