From b3942f278045cf74410d81a62ded4696f22d170d Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 26 八月 2023 13:08:14 +0800
Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerOrderPageVo.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 86efe09..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
@@ -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;
@@ -45,31 +43,28 @@
private Integer payType;
@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="应收全额")
+ private BigDecimal receivableMoney;
+
@ApiModelProperty(value="订单实际支付金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@ApiModelProperty(value="订单已收金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receiveMoney;
+ @ApiModelProperty(value = "实收金额")
+ private BigDecimal relReceiveMoney;
+
@ApiModelProperty(value="订单未支付金额")
- @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
@ApiModelProperty(value="订单备注")
--
Gitblit v1.7.1