From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java
index a13e254..10fab64 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderVo.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -18,22 +20,28 @@
@ApiModelProperty(value = "商品总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
@ApiModelProperty(value = "订单支付订金")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderPayDeposit;
@ApiModelProperty(value = "订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderPayMoney;
@ApiModelProperty(value = "订单商品列表")
List<AppSureOrderGoodsVo> appSureOrderGoodsVoList;
+ @ApiModelProperty(value = "是否可抽奖（0=否，1=是）")
+ private Boolean lotteryDraw;
-
-
+ @ApiModelProperty(value = "抽奖活动id")
+ private String lotteryEventId;
}
--
Gitblit v1.7.1