From 05522e00fc976bec6644bd00953e1a4e1c3d96e8 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 23 十月 2025 14:26:43 +0800
Subject: [PATCH] 调整
---
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 28e4ffe..b8ca3fd 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
@@ -5,6 +5,7 @@
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.utils.BeanUtil;
import cn.lili.common.utils.SnowFlake;
+import cn.lili.modules.lmk.domain.vo.GoodsCustomizeTemplateVO;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
import cn.lili.modules.order.cart.entity.vo.CartVO;
@@ -15,12 +16,14 @@
import cn.lili.modules.order.order.entity.enums.RefundStatusEnum;
import cn.lili.modules.promotion.entity.vos.PromotionSkuVO;
import cn.lili.mybatis.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Transient;
import java.math.BigDecimal;
import java.util.stream.Collectors;
@@ -85,6 +88,12 @@
@ApiModelProperty(value = "淇冮攢id")
private String promotionId;
+ @ApiModelProperty(value = "浼樻儬鍗穒d")
+ private String couponId;
+
+ @ApiModelProperty(value = "浼樻儬鍗峰悕绉�")
+ private String couponName;
+
@ApiModelProperty(value = "閿�鍞噾棰�")
private Double goodsPrice;
@@ -132,7 +141,11 @@
@ApiModelProperty(value = "鎶芥垚姣斾緥")
private BigDecimal commission;
-
+
+ @ApiModelProperty(value = "鍟嗗搧瀹氬埗妯℃澘VO")
+ @TableField(exist = false)
+ private GoodsCustomizeTemplateVO goodsCustomizeTemplateVO;
+
public Integer getDeliverNumber() {
if(deliverNumber == null){
return 0;
--
Gitblit v1.8.0