From 6acf6357094588946b5528f1ef1ed84a0f1037fd Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 13 六月 2025 19:45:27 +0800
Subject: [PATCH] 小程序收付款
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
index 97422b0..7d08220 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
@@ -9,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.List;
@@ -38,6 +39,7 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty(value = "商品id")
@@ -48,28 +50,35 @@
@TableField("max_num")
private Integer maxNum;
- @ApiModelProperty(value = "适用会员类型")
+ /* @ApiModelProperty(value = "适用会员类型")
@TableField("vip_ids")
- private String vipIds;
+ private String vipIds;*/
@ApiModelProperty(value = "活动开始日期")
@TableField("start_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime startTime;
@ApiModelProperty(value = "活动结束日期")
@TableField("end_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+
private LocalDateTime endTime;
@ApiModelProperty(value = "是否上架：0否 1是")
@TableField("is_shelves")
private Integer isShelves;
+ @ApiModelProperty(value = "活动价格")
+ @TableField(exist = false)
+ private BigDecimal sellingPrice;
- private List<GoodsSeckill> goodsSeckills;
+ @ApiModelProperty(value = "活动价格")
+ @TableField(exist = false)
+ private BigDecimal activityPrice;
+
+ @TableField(exist = false)
+ private GoodsSeckill goodsSeckills;
@TableField(exist = false)
private Goods goods;
--
Gitblit v1.7.1