From bd491c37218b0b3d9b518e4814967d814e781c02 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 19 一月 2026 18:07:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 791411d..45d26bc 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
@@ -101,8 +101,6 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "浣欓浣跨敤鏁伴噺", example = "1")
- private BigDecimal integral;
@ApiModelProperty(value = "鍞悗宸查��娆鹃噾棰�", example = "1")
private BigDecimal aftersaleMoney;
@@ -183,11 +181,10 @@
@ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
- private BigDecimal integralPrice;
+ private BigDecimal integral;
@ApiModelProperty(value = "娑堣�楃Н鍒嗗��", example = "1")
private BigDecimal useIntegral;
-
@ApiModelProperty(value = "鍜栧暋璁″垝璁㈠崟褰㈠紡 0鏂板 1寤堕暱", example = "1")
private Integer planOrderType;
@@ -202,6 +199,16 @@
private Integer distributionShopId;
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
+
+ @ApiModelProperty(value = "缁忛攢鍟嗙粨绠楅噾棰�", example = "1")
+ private BigDecimal shopSettlement;
+
+ @ApiModelProperty(value = "杩旇繕缁忛攢鍟嗙Н鍒�", example = "1")
+ private BigDecimal returnCustomerIntegral;
+
+ @ApiModelProperty(value = "杩旇繕鐢ㄦ埛绉垎", example = "1")
+ private BigDecimal returnMemberIntegral;
+
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
@@ -262,9 +269,5 @@
@ApiModelProperty(value = "鏃ユ湡 ")
@TableField(exist = false)
private String everyDay;
-
- @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
- @TableField(exist = false)
- private BigDecimal shopSettlement;
}
--
Gitblit v1.9.3