From a3d99a38fb3c56d9948eabb64dd301cb0aa2765e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 六月 2025 12:03:11 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java
index ab52478..be3d916 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopAllOrderPageVo.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 com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -20,42 +22,50 @@
@ApiModelProperty(value="订单id")
private String orderId;
- @Excel(name = "订单编号", width = 30)
+ @Excel(name = "订单号", width = 30, sort = 1)
@ApiModelProperty(value="订单编号")
private String orderNo;
@ApiModelProperty(value = "用户id")
private Long userId;
- @Excel(name = "客户信息", width = 30)
+ @Excel(name = "客户信息", width = 30, sort = 2)
@ApiModelProperty(value = "客户信息")
private String userInfo;
@ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;
- @Excel(name = "商品信息", width = 30)
+ @Excel(name = "商品信息", width = 30, sort = 3)
@ApiModelProperty(value="商品信息")
private String goodsInfo;
- @Excel(name = "订单金额", width = 30)
+ @Excel(name = "订单金额", width = 30, sort = 4)
@ApiModelProperty(value="订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
- @Excel(name = "优惠金额", width = 30)
+ @Excel(name = "优惠金额", width = 30, sort = 5)
@ApiModelProperty(value="优惠金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal discountMoney;
- @Excel(name = "应付金额", width = 30)
+ @Excel(name = "应收金额", width = 30, sort = 6)
@ApiModelProperty(value="应付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @Excel(name = "订单实际支付金额", width = 30)
+ @Excel(name = "订单实收金额", width = 30, sort = 7)
@ApiModelProperty(value="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @Excel(name = "订单来源", width = 30)
+ @Excel(name = "订单来源", width = 30, sort = 8)
@ApiModelProperty(value="订单来源")
private String orderFrom;
+ @Excel(name = "订单状态", width = 30)
+ @ApiModelProperty(value="订单状态")
+ private String orderStatus;
+
}
--
Gitblit v1.7.1