From 4ab710d8d70017f090dd9601099ded1a50a58a10 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 27 四月 2026 22:34:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java b/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
index bfe5459..c3bd1da 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/OrdersRefund.java
@@ -1,6 +1,7 @@
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -60,14 +61,57 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date refundTime;
- @ApiModelProperty(value = "闂ㄥ簵澶囨敞")
+ @ApiModelProperty(value = "閫�娆惧娉�")
private String refundRemark;
@ApiModelProperty(value = "骞冲彴鎿嶄綔浜猴紙type=1浣跨敤锛�", example = "0")
private Integer userId;
+ @ApiModelProperty(value = "閫�娆鹃噾棰濓紙鍒嗭級", example = "10000")
+ private Long refundAmount;
+
@ApiModelProperty(value = "閫�娆剧姸鎬侊細0=閫�娆句腑锛�1=閫�娆炬垚鍔燂紱2=閫�娆惧け璐�", example = "0")
private Integer status;
+ @ApiModelProperty(value = "閫�娆惧墠璁㈠崟鐘舵��", example = "1")
+ private Integer beforeStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟缂栧彿锛堝叧鑱旀煡璇級")
+ private String orderCode;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧淇℃伅锛堝叧鑱旀煡璇級")
+ private String goodsInfo;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟绫诲瀷锛堝叧鑱旀煡璇級")
+ private Integer orderType;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟绾у埆锛堝叧鑱旀煡璇級")
+ private Integer goodLevel;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐗╁搧绛夌骇鍚嶇О锛堝叧鑱旀煡璇級")
+ private String goodLevelName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "璁㈠崟鎬讳环锛堝叧鑱旀煡璇級")
+ private Long totalAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "瀹炰粯閲戦锛堝叧鑱旀煡璇級")
+ private Long payAmount;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "閫�娆剧敵璇峰紑濮嬫椂闂�(鏌ヨ鐢�)")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createStartTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "閫�娆剧敵璇风粨鏉熸椂闂�(鏌ヨ鐢�)")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createEndTime;
}
--
Gitblit v1.9.3