From 82203a196fa700adfc379b2b453b2266266c940c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 15 一月 2026 18:14:25 +0800
Subject: [PATCH] 经销商管理
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 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 0695672..1d9befb 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
@@ -1,3 +1,5 @@
+
+
package com.doumee.dao.business.model;
import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,6 +9,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
@@ -59,9 +62,16 @@
@ExcelColumn(name="鑱旂郴浜哄湴鍧�" ,index =8 ,width = 10)
private String linkaddr;
+ @ApiModelProperty(value = "璁㈠崟鎬讳环鏍�", example = "1")
+ private BigDecimal totalPrice;
+
@ApiModelProperty(value = "璁㈠崟瀹炰粯浠锋牸锛堝厓/鍜栬眴锛�", example = "1")
@ExcelColumn(name="璁㈠崟瀹炰粯浠锋牸",index =9,width = 10)
private BigDecimal price;
+
+ @ApiModelProperty(value = "閭垂閲戦", example = "1")
+ private BigDecimal mailPrice;
+
@ApiModelProperty(value = "璁㈠崟鐘舵��")
@ExcelColumn(name="璁㈠崟鐘舵��",index =10,width = 10)
@@ -123,7 +133,7 @@
@ApiModelProperty(value = "鏀粯鍗曞彿")
private String payOrderId;
- @ApiModelProperty(value = "鏀粯鏂瑰紡 0寰俊鏀粯 1绾夸笅鏀粯", example = "1")
+ @ApiModelProperty(value = "鏀粯鏂瑰紡 0鐜伴噾鏀粯 1绉垎鏀粯", example = "1")
private Integer payMethod;
@ApiModelProperty(value = "蹇�掑崟鍙�")
@@ -134,7 +144,6 @@
@ApiModelProperty(value = "蹇�掔紪鐮侊紙鍏宠仈labels琛級", example = "1")
private Integer kdId;
-
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@@ -173,10 +182,28 @@
@ApiModelProperty(value = "浼樻儬鍒哥紪鐮侊紙鍏宠仈MEMBER_COUPON琛級", example = "1")
private Integer couponId;
+
+ @ApiModelProperty(value = "绉垎鎶垫墸閲戦", example = "1")
+ private BigDecimal integralPrice;
+
+ @ApiModelProperty(value = "娑堣�楃Н鍒嗗��", example = "1")
+ private BigDecimal useIntegral;
+
+
@ApiModelProperty(value = "鍜栧暋璁″垝璁㈠崟褰㈠紡 0鏂板 1寤堕暱", example = "1")
private Integer planOrderType;
+ @ApiModelProperty(value = "鏀惰揣绫诲瀷锛�0=蹇�掗厤閫侊紱1=闂ㄥ簵鑷彁锛�", example = "1")
+ private Integer receiveType;
+ @ApiModelProperty(value = "鎻愯揣鍟嗛摵涓婚敭 shop锛歩d", example = "1")
+ private Integer pickUpShopId;
+
+ @ApiModelProperty(value = "鍒嗛攢鍟嗛摵涓婚敭 shop锛歩d", example = "1")
+ private Integer distributionShopId;
+
+ @ApiModelProperty(value = "鏍搁攢鐮�", example = "1")
+ private String exchangeCode;
@ApiModelProperty(value = "鏂囦欢鍦板潃")
@TableField(exist = false)
--
Gitblit v1.9.3