From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
index e26ef06..72f991b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtShopOrderPageVo.java
@@ -24,18 +24,18 @@
@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 nickName;
- @Excel(name = "用户姓名", width = 30)
+ @Excel(name = "用户姓名", width = 30, sort = 3)
@ApiModelProperty(value = "用户姓名")
private String userName;
@@ -46,52 +46,52 @@
@ApiModelProperty(value="订单商品列表")
private List<MgtOrderGoodsPageVo> mgtOrderGoodsPageVoList;
- @Excel(name = "商品信息", width = 30)
+ @Excel(name = "商品信息", width = 30, sort = 4)
@ApiModelProperty(value="商品信息")
private String goodsInfo;
- @Excel(name = "订单金额", width = 30)
+ @Excel(name = "订单金额", width = 30, sort = 5)
@ApiModelProperty(value="订单金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
- @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "订单提交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 8)
@ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @Excel(name = "优惠金额", width = 30)
+ @Excel(name = "优惠金额", width = 30, sort = 6)
@ApiModelProperty(value="优惠金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal discountMoney;
- @Excel(name = "应付金额", width = 30)
+ @Excel(name = "应付金额", width = 30, sort = 7)
@ApiModelProperty(value="应付金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
- @Excel(name = "订单实际支付金额", width = 30)
+ @Excel(name = "订单已付金额", width = 30, sort = 9)
@ApiModelProperty(value="订单实际支付金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
- @Excel(name = "订单未支付金额", width = 30)
+ @Excel(name = "剩余金额", width = 30, sort = 10)
@ApiModelProperty(value="订单未支付金额")
@JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
- @Excel(name = "订单来源", width = 30)
+ @Excel(name = "订单来源", width = 30, sort = 11)
@ApiModelProperty(value="订单来源")
private String orderFrom;
@ApiModelProperty(value="核销店铺id")
private Long shopId;
- @Excel(name = "核销店铺", width = 30)
+ @Excel(name = "核销店铺", width = 30, sort = 12)
@ApiModelProperty(value="核销店铺")
private String shopName;
- @Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", sort = 13)
@ApiModelProperty(value="核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
--
Gitblit v1.7.1