From f4e09a3f13bbf63b166c3a149497a93a9fd43bc5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 13 一月 2026 18:25:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/dao/business/model/Goodsorder.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 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..9005c29 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
@@ -7,6 +7,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;
@@ -58,6 +59,9 @@
@ApiModelProperty(value = "鏀惰揣鍦板潃")
@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)
@@ -173,10 +177,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