From d8d6661b4736e5de37d4a158b8286509b748d62b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 22 一月 2026 18:16:54 +0800
Subject: [PATCH] 经销商管理

---
 server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java |   25 ++++++++++++++++++-------
 1 files changed, 18 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 959dc2a..08b8266 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,7 +197,6 @@
 
     @ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
     private Integer distributionShopId;
-
     @ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
     private String exchangeCode;
 
@@ -223,7 +221,6 @@
     @ApiModelProperty(value = "璁″垝璁㈠崟")
     @TableField(exist = false)
     private    PlanorderDetail  planorderDetail;
-
 
     @ApiModelProperty(value = "鏄电О")
     @TableField(exist = false)
@@ -255,15 +252,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)
@@ -272,5 +280,8 @@
     @ApiModelProperty(value = "鏃ユ湡 ")
     @TableField(exist = false)
     private String everyDay;
+    @ApiModelProperty(value = "缁忛攢鍟嗗悕绉� ")
+    @TableField(exist = false)
+    private String shopName;
 
 }

--
Gitblit v1.9.3