From d617e84caebaf2e7aa09c55cb2bd89c5a23ef8ac Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期六, 28 六月 2025 15:58:33 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
index 8c92c23..003bdb2 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java
@@ -39,23 +39,30 @@
@ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
private Integer orderStatus;
+ @ApiModelProperty(value = "支付方式1.全款2.订金")
+ private Integer payType;
+
@ApiModelProperty(value = "商品总价")
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
private BigDecimal couponDiscount;
- @ApiModelProperty(value="应收金额")
- private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
private BigDecimal receivableDeposit;
+
+ @ApiModelProperty(value="应收全额")
+ private BigDecimal receivableMoney;
@ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
@ApiModelProperty(value="订单已收金额")
private BigDecimal receiveMoney;
+
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
@ApiModelProperty(value="订单未支付金额")
private BigDecimal unPaidMoney;
@@ -73,6 +80,9 @@
@ApiModelProperty(value="订单来源")
private String orderFromDesc;
+ @ApiModelProperty(value="活动名字")
+ private String activityName;
+
@ApiModelProperty(value="订单商品列表")
private List<MerOrderGoodsPageVo> merOrderGoodsVoList;
}
--
Gitblit v1.7.1