From e68c33e84e7f85fe8504de9c105d8597b996a906 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 02 十二月 2024 18:05:08 +0800
Subject: [PATCH] 完成购物车支付业务逻辑
---
ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
index d6abb6a..3497fd6 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java
@@ -72,13 +72,38 @@
@TableField("total_amount")
private BigDecimal totalAmount;
+ @ApiModelProperty(value = "满减金额")
+ @TableField("full_reduction_amount")
+ private BigDecimal fullReductionAmount;
+
+ @ApiModelProperty(value = "代金券抵扣金额")
+ @TableField("money_amount")
+ private BigDecimal moneyAmount;
+
+ @ApiModelProperty(value = "折扣券抵扣金额")
+ @TableField("discount_amount")
+ private BigDecimal discountAmount;
+
+ @ApiModelProperty(value = "商品券抵扣总金额")
+ @TableField("good_amount")
+ private BigDecimal goodAmount;
+
+ @ApiModelProperty(value = "活动优惠金额")
+ @TableField("activity_amount")
+ private BigDecimal activityAmount;
+
+ @ApiModelProperty(value = "优惠总金额")
+ @TableField("discount_total_amount")
+ private BigDecimal discountTotalAmount;
+
+
@ApiModelProperty(value = "实际支付价格")
@TableField("payment_amount")
private BigDecimal paymentAmount;
@ApiModelProperty(value = "使用积分")
@TableField("point")
- private BigDecimal point;
+ private Integer point;
@ApiModelProperty(value = "1wx2积分")
@TableField("pay_method")
@@ -87,6 +112,10 @@
@ApiModelProperty(value = "使用的优惠劵json")
@TableField("coupon_json")
private String couponJson;
+
+ @ApiModelProperty(value = "订单优惠活动的json快照")
+ @TableField("activity_json")
+ private String activityJson;
@ApiModelProperty(value = "运费")
@TableField("express_amount")
@@ -106,7 +135,7 @@
@ApiModelProperty(value = "本单获取的积分")
@TableField("get_point")
- private BigDecimal getPoint;
+ private Integer getPoint;
@ApiModelProperty(value = "微信支付号")
@TableField("serial_number")
--
Gitblit v1.7.1