From d9e75c8c09738b31c375e3b843a3f2d4927f325f Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 26 七月 2023 09:13:29 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java
index ad3fe57..eabc7e3 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtActivityOrderPageVo.java
@@ -1,6 +1,7 @@
package com.ruoyi.order.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -17,59 +18,72 @@
@Data
public class MgtActivityOrderPageVo {
- @ApiModelProperty("订单id")
- private String orderId;
- @ApiModelProperty("订单编号")
+ @Excel(name = "订单编号", width = 30)
+ @ApiModelProperty(value="订单编号")
private String orderNo;
- @ApiModelProperty("秒杀活动")
+ @Excel(name = "秒杀活动", width = 30)
+ @ApiModelProperty(value="秒杀活动")
private String activityName;
@ApiModelProperty(value = "用户id")
private Long userId;
+ @Excel(name = "用户昵称", width = 30)
@ApiModelProperty(value = "用户昵称")
private String nickName;
+ @Excel(name = "用户姓名", width = 30)
@ApiModelProperty(value = "用户姓名")
private String userName;
+ @Excel(name = "用户电话", width = 30)
@ApiModelProperty(value = "用户电话")
private String userMobile;
- @ApiModelProperty("商品名称")
+ @Excel(name = "商品名称", width = 30)
+ @ApiModelProperty(value="商品名称")
private String goodsName;
+ @Excel(name = "秒杀价格", width = 30)
@ApiModelProperty(value = "秒杀价格")
private BigDecimal activityPrice;
- @ApiModelProperty("购买数量")
+ @Excel(name = "购买数量", width = 30)
+ @ApiModelProperty(value="购买数量")
private Integer buyNum;
- @ApiModelProperty("订单金额")
+ @Excel(name = "订单金额", width = 30)
+ @ApiModelProperty(value="订单金额")
private BigDecimal orderMoney;
- @ApiModelProperty("应付金额")
+ @Excel(name = "应付金额", width = 30)
+ @ApiModelProperty(value="应付金额")
private BigDecimal receivableMoney;
- @ApiModelProperty("创建时间")
+ @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("订单实际支付金额")
+ @Excel(name = "订单实际支付金额", width = 30)
+ @ApiModelProperty(value="订单实际支付金额")
private BigDecimal payMoney;
- @ApiModelProperty("订单未支付金额")
+ @Excel(name = "订单未支付金额", width = 30)
+ @ApiModelProperty(value="订单未支付金额")
private BigDecimal unPaidMoney;
- @ApiModelProperty("核销店铺id")
+ @ApiModelProperty(value="核销店铺id")
private Long shopId;
- @ApiModelProperty("核销店铺")
+ @Excel(name = "核销店铺", width = 30)
+ @ApiModelProperty(value="核销店铺")
private String shopName;
- @ApiModelProperty("核销时间")
+ @Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty(value="核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
}
--
Gitblit v1.7.1