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/MgtMemberOrderPageVo.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
index 7bd4811..4e33edc 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java
@@ -1,6 +1,8 @@
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.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -23,15 +25,15 @@
private String orderId;
@Excel(name = "订单编号", width = 30)
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@Excel(name = "核销门店", width = 30)
- @ApiModelProperty("核销门店")
+ @ApiModelProperty(value="核销门店")
private String shopName;
@Excel(name = "商品信息", width = 30)
- @ApiModelProperty("商品信息")
+ @ApiModelProperty(value="商品信息")
private String goodsInfo;
@Excel(name = "订单状态", width = 30)
@@ -40,35 +42,48 @@
@Excel(name = "订单总价", width = 30)
@ApiModelProperty(value = "订单总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@Excel(name = "优惠券抵扣", width = 30)
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal discountMoney;
@Excel(name = "应收金额", width = 30)
- @ApiModelProperty("应收金额")
+ @ApiModelProperty(value="应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @Excel(name = "订单实际支付金额", width = 30)
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
+ @Excel(name = "订单实收金额", width = 30)
+ @ApiModelProperty(value = "实收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal receiveMoney;
+
+ @Excel(name = "订单未支付金额", width = 30)
+ @ApiModelProperty(value="订单未支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private BigDecimal unPaidMoney;
+
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@Excel(name = "订单来源", width = 30)
- @ApiModelProperty("订单来源")
+ @ApiModelProperty(value="订单来源")
private String orderFromDesc;
- @ApiModelProperty("核销门店id")
+ @ApiModelProperty(value="核销门店id")
private Long shopId;
- @ApiModelProperty("订单来源")
+ @ApiModelProperty(value="订单来源")
private Integer orderFrom;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsVoList;
}
--
Gitblit v1.7.1