From b05fea19990632b2ec6320cbfaab2bddc87006c0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 21:17:36 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 insertions(+), 3 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 e3488cb..b1afc85 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
@@ -62,7 +62,7 @@
@ExcelColumn(name="鑱旂郴浜哄湴鍧�" ,index =8 ,width = 10)
private String linkaddr;
- @ApiModelProperty(value = "璁㈠崟鎬讳环鏍�", example = "1")
+ @ApiModelProperty(value = "璁㈠崟鎬讳环鏍�(鍖呭惈杩愯垂)", example = "1")
private BigDecimal totalPrice;
@ApiModelProperty(value = "璁㈠崟瀹炰粯浠锋牸锛堝厓/鍜栬眴锛�", example = "1")
@@ -203,6 +203,21 @@
@ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
private BigDecimal shopSettlement;
+ @ApiModelProperty(value = "杩旇繕缁忛攢鍟嗙Н鍒�", example = "1")
+ private BigDecimal returnCustomerIntegral;
+
+ @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 = "鏂囦欢鍦板潃")
@TableField(exist = false)
private String resourcePath;
@@ -218,6 +233,18 @@
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
private String nickName;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍙栨秷浜哄憳濮撳悕")
+ @TableField(exist = false)
+ private String cancelUserName;
+ @ApiModelProperty(value = "閫�娆句汉濮撳悕")
+ @TableField(exist = false)
+ private String refundUserName;
+ @ApiModelProperty(value = "鍙戣揣浜哄鍚�")
+ @TableField(exist = false)
+ private String kdUserName;
@ApiModelProperty(value = "鐢佃瘽")
@TableField(exist = false)
private String phone;
@@ -228,8 +255,6 @@
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@TableField(exist = false)
private String addr;
-
-
@ApiModelProperty(value = "寮�濮嬫椂闂� ")
@TableField(exist = false)
@@ -246,6 +271,15 @@
@ApiModelProperty(value = "璁㈠崟鎬绘暟 ")
@TableField(exist = false)
private Long orderCount;
+ @ApiModelProperty(value = "寰呮敮浠樻�绘暟 ")
+ @TableField(exist = false)
+ private Integer waitPayNum;
+ @ApiModelProperty(value = "寰呭彂璐ф�绘暟 ")
+ @TableField(exist = false)
+ private Integer waitKdNum;
+ @ApiModelProperty(value = "寰呮敹璐ф�绘暟 ")
+ @TableField(exist = false)
+ private Integer waitDoneNum;
@ApiModelProperty(value = "璁㈠崟鍟嗗搧鎬绘暟 ")
@TableField(exist = false)
private Long goodsCount;
@@ -264,5 +298,8 @@
@ApiModelProperty(value = "鏃ユ湡 ")
@TableField(exist = false)
private String everyDay;
+ @ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
+ @TableField(exist = false)
+ private String shopName;
}
--
Gitblit v1.9.3