From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
index ab52e82..d8c594f 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/ConfirmOrderVo.java
@@ -15,32 +15,52 @@
@Data
@ApiModel
public class ConfirmOrderVo {
- @ApiModelProperty("商品列表")
- private List<MyShoppingCartVo> goodsList;
+ @ApiModelProperty("商品id")
+ private Integer goodId;
+
+ @ApiModelProperty("商品名称")
+ private String goodName;
+
+
+ @ApiModelProperty("商品封面图")
+ private String homePicture;
+
+ @ApiModelProperty("售价现金")
+ private BigDecimal cash;
+ @ApiModelProperty("划线价格")
+ private BigDecimal originalPrice;
+ @ApiModelProperty("购买数量")
+ private Integer number;
+
+ @ApiModelProperty("限购数量")
+ private Integer purchaseLimitNum;
+
@ApiModelProperty("核销门店")
private String shopName;
@ApiModelProperty("核销门店id")
private Integer shopId;
- @ApiModelProperty("订单金额")
+
+ @ApiModelProperty("订单总金额")
private BigDecimal orderMoney;
- @ApiModelProperty("优惠活动")
- private String activityName;
- @ApiModelProperty("优惠金额")
- private BigDecimal discountAmount;
- @ApiModelProperty("获得积分")
- private Integer earnPoint;
- @ApiModelProperty("支付金额")
- private BigDecimal payMoney;
+
+/* @ApiModelProperty("支付金额")
+ private BigDecimal payMoney;*/
@ApiModelProperty("订单总积分")
private Integer orderPoint;
@ApiModelProperty("剩余积分")
private Integer residualPoint;
- @ApiModelProperty("快递费")
- private BigDecimal expressFee;
- @ApiModelProperty("支付方式（1=现金，2=积分）")
+ @ApiModelProperty("售价积分")
+ private Integer point;
+
+ @ApiModelProperty("可抵扣金额")
+ private BigDecimal deduction;
+
+ @ApiModelProperty("支付方式（1=现金，2=积分,3=混合）")
private Integer paymentType;
- @ApiModelProperty("活动是否可以和优惠券同时使用")
- private Boolean useSimultaneously;
- @ApiModelProperty("优惠券列表")
- private List<PaymentUserCouponVo> coupon;
+ @ApiModelProperty("是否超出限购数量")
+ private Boolean IsPurchaseLimit;
+
+ @ApiModelProperty("结束时间戳")
+ private Long endTimeStamp;
+
}
--
Gitblit v1.7.1