From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
index d754808..b2cee53 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -1,6 +1,8 @@
package com.ruoyi.order.domain.vo;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,6 +28,9 @@
@ApiModelProperty(value = "商品简介")
private String goodsIntroduction;
+ @ApiModelProperty(value = "商品标签")
+ private String goodsTag;
+
@ApiModelProperty(value = "商品类型1周期2服务3体验4单品")
private Integer goodsType;
@@ -36,27 +41,36 @@
private Integer buyNum;
@ApiModelProperty(value = "优惠券id")
- private Long userCouponId;
+ private String memberCouponId;
@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 = "是否计算优惠券0否1是")
private Integer useCoupon;
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
@ApiModelProperty(value = "商品实际价格")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal goodsRealPrice;
@ApiModelProperty(value = "优惠券列表")
- private List<AppUserCouponVo> appUserCouponVoList;
+ private List<AppMemberCouponVo> appMemberCouponVoList;
}
--
Gitblit v1.7.1