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 | 15 ++++++++++++---
1 files changed, 12 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 e58f89f..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
@@ -203,6 +203,13 @@
@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)
private String resourcePath;
@@ -245,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