From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
index 3f757c8..63f1660 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java
@@ -1,13 +1,13 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.ruoyi.system.api.domain.vo.MerCouponGoodsListVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
+import java.util.List;
/**
* @ClassName MerMemberOrderVo
@@ -25,45 +25,49 @@
@ApiModelProperty(value="订单编号")
private String orderNo;
+ @ApiModelProperty(value="支付方式1全款2订金")
+ private Integer payType;
+
+
@ApiModelProperty(value="订单状态")
private Integer orderStatus;
@ApiModelProperty(value = "商品总价")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderGoodsMoney;
@ApiModelProperty(value = "优惠券抵扣")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal couponDiscount;
@ApiModelProperty(value="应付金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="应收订金")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableDeposit;
- @ApiModelProperty(value="实收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+ @ApiModelProperty(value="应收金额")
private BigDecimal receiveMoney;
+ @ApiModelProperty(value="实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="已收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal payMoney;
@ApiModelProperty(value="未收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal unPaidMoney;
-
- @ApiModelProperty(value="收款时间")
+
+ @ApiModelProperty(value = "收款时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date receiveMoneyTime;
-
- @ApiModelProperty(value="收款金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
+ @ApiModelProperty(value = "收款金额")
private BigDecimal thisReceiveMoney;
-
- @ApiModelProperty(value="收款方式")
+
+ @ApiModelProperty(value = "收款方式")
private String thisReceiveType;
+
+ @ApiModelProperty(value = "商品信息")
+ private List<MerCouponGoodsListVo> goodsList;
}
--
Gitblit v1.7.1