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/MgtActivityOrderPageVo.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 ebd4946..7409cfd 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,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;
@@ -19,12 +21,15 @@
public class MgtActivityOrderPageVo {
+ @ApiModelProperty(value="订单id")
+ private String orderId;
+
@Excel(name = "订单编号", width = 30)
- @ApiModelProperty("订单编号")
+ @ApiModelProperty(value="订单编号")
private String orderNo;
@Excel(name = "秒杀活动", width = 30)
- @ApiModelProperty("秒杀活动")
+ @ApiModelProperty(value="秒杀活动")
private String activityName;
@ApiModelProperty(value = "用户id")
@@ -43,47 +48,52 @@
private String userMobile;
@Excel(name = "商品名称", width = 30)
- @ApiModelProperty("商品名称")
+ @ApiModelProperty(value="商品名称")
private String goodsName;
@Excel(name = "秒杀价格", width = 30)
@ApiModelProperty(value = "秒杀价格")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal activityPrice;
@Excel(name = "购买数量", width = 30)
- @ApiModelProperty("购买数量")
+ @ApiModelProperty(value="购买数量")
private Integer buyNum;
@Excel(name = "订单金额", width = 30)
- @ApiModelProperty("订单金额")
+ @ApiModelProperty(value="订单金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal orderMoney;
@Excel(name = "应付金额", width = 30)
- @ApiModelProperty("应付金额")
+ @ApiModelProperty(value="应付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@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="订单实际支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal payMoney;
@Excel(name = "订单未支付金额", width = 30)
- @ApiModelProperty("订单未支付金额")
+ @ApiModelProperty(value="订单未支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal unPaidMoney;
- @ApiModelProperty("核销店铺id")
+ @ApiModelProperty(value="核销店铺id")
private Long shopId;
@Excel(name = "核销店铺", width = 30)
- @ApiModelProperty("核销店铺")
+ @ApiModelProperty(value="核销店铺")
private String shopName;
@Excel(name = "核销时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("核销时间")
+ @ApiModelProperty(value="核销时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date verifyTime;
}
--
Gitblit v1.7.1