From 3b2c5fb47caca6ab286e0c8ed8c0575024c528d0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 09:18:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
index dd0e187..fb2387a 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java
@@ -22,6 +22,7 @@
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.math.BigDecimal;
import java.util.stream.Collectors;
/**
@@ -84,6 +85,12 @@
@ApiModelProperty(value = "淇冮攢id")
private String promotionId;
+ @ApiModelProperty(value = "浼樻儬鍗穒d")
+ private String couponId;
+
+ @ApiModelProperty(value = "浼樻儬鍗峰悕绉�")
+ private String couponName;
+
@ApiModelProperty(value = "閿�鍞噾棰�")
private Double goodsPrice;
@@ -129,6 +136,9 @@
@ApiModelProperty(value = "宸插彂璐ф暟閲�")
private Integer deliverNumber;
+ @ApiModelProperty(value = "鎶芥垚姣斾緥")
+ private BigDecimal commission;
+
public Integer getDeliverNumber() {
if(deliverNumber == null){
return 0;
--
Gitblit v1.8.0