From 17b72a7f765612e3ebd0d0330e7a668955793172 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 19:20:13 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 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 3472592..1874f39 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")
@@ -71,7 +71,6 @@
@ApiModelProperty(value = "閭垂閲戦", example = "1")
private BigDecimal mailPrice;
-
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@@ -198,12 +197,18 @@
@ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
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)
@@ -217,10 +222,15 @@
@TableField(exist = false)
private PlanorderDetail planorderDetail;
-
@ApiModelProperty(value = "鏄电О")
@TableField(exist = false)
private String nickName;
+ @ApiModelProperty(value = "鐢ㄦ埛濮撳悕")
+ @TableField(exist = false)
+ private String memberName;
+ @ApiModelProperty(value = "鍙戣揣浜哄鍚�")
+ @TableField(exist = false)
+ private String kdUserName;
@ApiModelProperty(value = "鐢佃瘽")
@TableField(exist = false)
private String phone;
@@ -248,15 +258,26 @@
@ApiModelProperty(value = "璁㈠崟鎬绘暟 ")
@TableField(exist = false)
- private Integer orderCount;
-
+ 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;
@ApiModelProperty(value = "璁㈠崟鎬婚 ")
@TableField(exist = false)
private BigDecimal orderMoneyCount;
@ApiModelProperty(value = "鏈湀璁㈠崟鎬绘暟 ")
@TableField(exist = false)
- private Integer orderMonthCount;
+ private Long orderMonthCount;
@ApiModelProperty(value = "鏈湀璁㈠崟鎬婚 ")
@TableField(exist = false)
@@ -265,5 +286,8 @@
@ApiModelProperty(value = "鏃ユ湡 ")
@TableField(exist = false)
private String everyDay;
+ @ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
+ @TableField(exist = false)
+ private String shopName;
}
--
Gitblit v1.9.3