From fc9240bd6b246ad71c4050510880a49ce07138a3 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 13 二月 2026 09:51:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dingyuannongji
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
index 1874f39..13a8ba5 100644
--- a/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
+++ b/server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java
@@ -209,6 +209,17 @@
@ApiModelProperty(value = "杩旇繕鐢ㄦ埛绉垎", example = "1")
private BigDecimal returnMemberIntegral;
+ @ApiModelProperty(value = "閫�娆鹃噾棰�", example = "1")
+ private BigDecimal refundMoney;
+
+ @ApiModelProperty(value = "閫�娆炬椂闂�", example = "1")
+ private Date refundTime;
+
+ @ApiModelProperty(value = "閫�娆炬搷浣滀汉", example = "1")
+ private Integer refundUserId;
+
+ @ApiModelProperty(value = "閫�娆惧娉�", example = "1")
+ private Integer refundInfo;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
@@ -228,6 +239,15 @@
@ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
@TableField(exist = false)
private String memberName;
+ @ApiModelProperty(value = "浼樻儬鍒稿悕绉�")
+ @TableField(exist = false)
+ private String couponName;
+ @ApiModelProperty(value = "鍙栨秷浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String cancelUserName;
+ @ApiModelProperty(value = "閫�娆句汉濮撳悕")
+ @TableField(exist = false)
+ private String refundUserName;
@ApiModelProperty(value = "鍙戣揣浜哄鍚�")
@TableField(exist = false)
private String kdUserName;
@@ -238,11 +258,14 @@
@TableField(exist = false)
private String imgurl;
+
+ @ApiModelProperty(value = "缁忛攢鍟嗙數璇�")
+ @TableField(exist = false)
+ private String shopPhone;
+
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@TableField(exist = false)
private String addr;
-
-
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
@@ -289,5 +312,8 @@
@ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
@TableField(exist = false)
private String shopName;
+ @ApiModelProperty(value = "鏄惁闇�瑕佺粺璁� ")
+ @TableField(exist = false)
+ private Boolean needCount;
}
--
Gitblit v1.9.3