From 092e1895006b688ea8d71278d9fa39b1be7f61ed Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期六, 11 十月 2025 17:27:19 +0800
Subject: [PATCH] 订单代码上移到controller
---
framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java | 17 +++++++++++++++++
1 files changed, 17 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..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,13 +16,16 @@
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;
/**
@@ -84,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;
@@ -129,6 +139,13 @@
@ApiModelProperty(value = "宸插彂璐ф暟閲�")
private Integer deliverNumber;
+ @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