From 5627daeb1ac1a29947e902f9a7efb6730ed98611 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 07 七月 2023 20:35:50 +0800
Subject: [PATCH] 管理台bug和用户端生日卡
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java | 9 ++++++---
1 files changed, 6 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..be5a4a1 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,6 @@
package com.ruoyi.order.domain.vo;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,10 +36,13 @@
private Integer buyNum;
@ApiModelProperty(value = "优惠券id")
- private Long userCouponId;
+ private String memberCouponId;
@ApiModelProperty(value = "商品售价")
private BigDecimal goodsPrice;
+
+ @ApiModelProperty(value = "活动售价")
+ private BigDecimal activityPrice;
@ApiModelProperty(value = "商品总价")
private BigDecimal goodsTotalPrice;
@@ -57,6 +60,6 @@
private BigDecimal goodsRealPrice;
@ApiModelProperty(value = "优惠券列表")
- private List<AppUserCouponVo> appUserCouponVoList;
+ private List<AppMemberCouponVo> appMemberCouponVoList;
}
--
Gitblit v1.7.1