From 187daede46960fb4344cb71169d673cb372e3ebc Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 28 四月 2026 13:49:44 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into 2.0
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
index bd6151a..f2e8db8 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TExchangeCodeUseRecord.java
@@ -28,12 +28,20 @@
private Long detailId;
@TableField("order_id")
- @ApiModelProperty("订单ID")
+ @ApiModelProperty("订单ID，兑换收入为0")
private Long orderId;
+
+ @TableField("refund_no")
+ @ApiModelProperty("退款单号/退款流水号")
+ private String refundNo;
@TableField("user_id")
@ApiModelProperty("用户ID")
private Long userId;
+
+ @TableField("change_type")
+ @ApiModelProperty("变动类型 1兑换收入 2充电消费 3退款返还")
+ private Integer changeType;
@TableField("used_amount")
@ApiModelProperty("本次使用金额")
@@ -50,6 +58,10 @@
@ApiModelProperty("本次使用赠送金额")
private BigDecimal giftUsedAmount;
+ @TableField("gift_used_amount")
+ @ApiModelProperty("本次使用赠送金额")
+ private BigDecimal giftUsedAmount;
+
@TableField(exist = false)
private String uid;
@@ -58,9 +70,6 @@
@TableField(exist = false)
private String orderCode;
-
- @TableField(exist = false)
- private Integer changeType;
@TableField(exist = false)
private BigDecimal changeAmount;
--
Gitblit v1.7.1