From f19155dcda0413563963d545eed3045364814c0d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 12 八月 2023 05:14:27 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerMemberOrderVo.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 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..a594994 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,8 +1,6 @@
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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -29,31 +27,31 @@
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)
+
private BigDecimal receiveMoney;
@ApiModelProperty(value="已收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal payMoney;
@ApiModelProperty(value="未收金额")
- @JsonSerialize(using = ToStringSerializer.class)
+
private BigDecimal unPaidMoney;
@ApiModelProperty(value="收款时间")
@@ -61,7 +59,6 @@
private Date receiveMoneyTime;
@ApiModelProperty(value="收款金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal thisReceiveMoney;
@ApiModelProperty(value="收款方式")
--
Gitblit v1.7.1