From be2e00346362a9a3ff4f1a46de134639c73953ed Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 15 七月 2025 14:11:55 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
index 54dd9dd..2060ffb 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppUserOrderPageVo.java
@@ -1,10 +1,14 @@
package com.ruoyi.order.domain.vo;
-import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -20,6 +24,9 @@
@ApiModelProperty(value = "订单id")
private String orderId;
+ @ApiModelProperty(value="活动id")
+ private String activityId;
+
@ApiModelProperty(value="订单编号")
private String orderNo;
@@ -33,10 +40,14 @@
private List<AppUserOrderGoodsPageVo> appUserOrderGoodsPageVoList;
@ApiModelProperty(value="订单支付金额")
+ @JsonSerialize(using = ToStringSerializer.class)
private BigDecimal receivableMoney;
@ApiModelProperty(value="商品数量")
private Integer goodsNum;
+
+ @ApiModelProperty(value="核销商户类型（0=全部店铺，1=部分商户，2=单个商户）")
+ private Integer shopNumber;
@ApiModelProperty(value="商户id")
private Long shopId;
@@ -53,4 +64,20 @@
@ApiModelProperty(value = "核销码")
private String verifyCode;
+ @ApiModelProperty(value = "订单创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ @ApiModelProperty(value = "支付截止时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ @ApiModelProperty(value = "查询关键字", hidden = true)
+ @JsonIgnore
+ private String keyword;
+
+ @ApiModelProperty(value="取消方（1=平台，2=商户，3=用户）")
+ private Integer cancelType;
+
+
}
--
Gitblit v1.7.1