From cead7b98d5cebc0825b919799e23732877361de0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 六月 2025 18:39:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtMemberOrderPageVo.java | 59 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 15 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 6524455..a948648 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,9 @@
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;
@@ -21,40 +24,66 @@
@ApiModelProperty(value = "订单id")
private String orderId;
- @ApiModelProperty("订单编号")
+ @Excel(name = "订单编号", width = 30, sort = 1)
+ @ApiModelProperty(value="订单编号")
private String orderNo;
- @ApiModelProperty("核销门店id")
- private Long shopId;
-
- @ApiModelProperty("核销门店")
+ @Excel(name = "核销门店", width = 30, sort = 3)
+ @ApiModelProperty(value="核销门店")
private String shopName;
- @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
- private Integer orderStatus;
+ @Excel(name = "商品信息", width = 30, sort = 4)
+ @ApiModelProperty(value="商品信息")
+ private String goodsInfo;
+ @Excel(name = "订单状态", width = 30, sort = 10)
+ @ApiModelProperty(value = "订单状态0.已取消1.待支付2.待核销3.已完成")
+ private String orderStatus;
+
+ @Excel(name = "订单总价", width = 30, sort = 5)
@ApiModelProperty(value = "订单总价")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
+ @Excel(name = "优惠券抵扣", width = 30, sort = 7)
@ApiModelProperty(value = "优惠券抵扣")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal discountMoney;
- @ApiModelProperty("应收金额")
+ @Excel(name = "应收金额", width = 30, sort = 6)
+ @ApiModelProperty(value="应收金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @ApiModelProperty("订单实际支付金额")
+ @ApiModelProperty(value="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @ApiModelProperty("创建时间")
+ @Excel(name = "订单实收金额", width = 30, sort = 8)
+ @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", sort = 9)
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("订单来源")
- private Integer orderFrom;
-
- @ApiModelProperty("订单来源")
+ @Excel(name = "订单来源", width = 30, sort = 2)
+ @ApiModelProperty(value="订单来源")
private String orderFromDesc;
- @ApiModelProperty("订单商品列表")
+ @ApiModelProperty(value="核销门店id")
+ private Long shopId;
+
+ @ApiModelProperty(value="订单来源")
+ private Integer orderFrom;
+
+ @ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsVoList;
}
--
Gitblit v1.7.1