From a8e56f03a22c722ccf3f67a408919e6c8f256de3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 10 八月 2023 01:45:01 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
index b9ee078..dff0b54 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerTotalOrderVo.java
@@ -1,5 +1,7 @@
package com.ruoyi.order.domain.vo;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,21 +17,27 @@
@Data
public class MerTotalOrderVo {
- @ApiModelProperty(value = "是否代理商0否1是")
- private Integer agencyFlag;
@ApiModelProperty(value = "总订单数")
private Integer orderTotal;
@ApiModelProperty(value = "应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value = "实收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal relReceiveMoney;
- @ApiModelProperty(value = "实付金额")
+ @ApiModelProperty(value = "已收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal relPayMoney;
@ApiModelProperty(value = "未收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unpaidMoney;
+
+ @ApiModelProperty(value = "总订金")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal receivableDeposit;
}
--
Gitblit v1.7.1