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/AppPanicBuyVo.java | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPanicBuyVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPanicBuyVo.java index 42fa93d..a97174c 100644 --- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPanicBuyVo.java +++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPanicBuyVo.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; @@ -16,12 +18,15 @@ public class AppPanicBuyVo { @ApiModelProperty(value = "商品总价") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal orderGoodsMoney; @ApiModelProperty(value = "订单支付订金") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal orderPayDeposit; @ApiModelProperty(value = "订单支付金额") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal orderPayMoney; @ApiModelProperty(value = "活动Id") @@ -39,6 +44,9 @@ @ApiModelProperty(value = "商品类型1周期2服务3体验4单品") private Integer goodsType; + @ApiModelProperty(value = "商品标签") + private String goodsTag; + @ApiModelProperty(value = "商品图片") private String goodsPicture; @@ -46,19 +54,30 @@ private Integer buyNum; @ApiModelProperty(value = "商品售价") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal goodsPrice; @ApiModelProperty(value = "活动售价") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal activityPrice; @ApiModelProperty(value = "商品总价") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal goodsTotalPrice; @ApiModelProperty(value = "商品订金") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal goodsDeposit; @ApiModelProperty(value = "商品实际价格") + @JsonSerialize(using = ToStringSerializer.class) private BigDecimal goodsRealPrice; + @ApiModelProperty(value = "是否可抽奖(0=否,1=是)") + private Boolean lotteryDraw; + + @ApiModelProperty(value = "抽奖活动id") + private String lotteryEventId; + } -- Gitblit v1.7.1