From ae917e09a897843344424ca7d36dd22c216f5f50 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 19 一月 2026 18:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 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 44e732e..3d630ef 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
@@ -72,7 +72,6 @@
@ApiModelProperty(value = "閭垂閲戦", example = "1")
private BigDecimal mailPrice;
-
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@TableField(exist = false)
@@ -102,8 +101,6 @@
@ApiModelProperty(value = "澶囨敞")
private String remark;
- @ApiModelProperty(value = "浣欓浣跨敤鏁伴噺", example = "1")
- private BigDecimal integral;
@ApiModelProperty(value = "鍞悗宸查��娆鹃噾棰�", example = "1")
private BigDecimal aftersaleMoney;
@@ -184,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;
@@ -201,12 +197,18 @@
@ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
private Integer distributionShopId;
-
@ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
private String exchangeCode;
- @ApiModelProperty(value = "璁㈠崟缁撶畻閲戦")
+ @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)
@@ -219,7 +221,6 @@
@ApiModelProperty(value = "璁″垝璁㈠崟")
@TableField(exist = false)
private PlanorderDetail planorderDetail;
-
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
@@ -251,15 +252,17 @@
@ApiModelProperty(value = "璁㈠崟鎬绘暟 ")
@TableField(exist = false)
- private Integer orderCount;
-
+ private Long orderCount;
+ @ApiModelProperty(value = "璁㈠崟鍟嗗搧鎬绘暟 ")
+ @TableField(exist = false)
+ private Long goodsCount;
@ApiModelProperty(value = "璁㈠崟鎬婚 ")
@TableField(exist = false)
private BigDecimal orderMoneyCount;
@ApiModelProperty(value = "鏈湀璁㈠崟鎬绘暟 ")
@TableField(exist = false)
- private Integer orderMonthCount;
+ private Long orderMonthCount;
@ApiModelProperty(value = "鏈湀璁㈠崟鎬婚 ")
@TableField(exist = false)
--
Gitblit v1.9.3