From 43e82ea6be043159401551036990e8132ac312d0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 01 九月 2025 11:08:44 +0800
Subject: [PATCH] 回调地址替换
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java | 39 +++++++++++++++++++++++++++++----------
1 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
index 34caefb..0852ad8 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/GoodsVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.other.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.other.api.domain.GoodsEvaluate;
import com.ruoyi.other.api.domain.Shop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -22,9 +24,6 @@
@ApiModelProperty(value = "限购数量（-1不限购）")
private Integer purchaseLimit;
- @ApiModelProperty(value = "类型（1=服务商品，2=单品商品）")
- private Integer type;
-
@ApiModelProperty(value = "商品简介")
private String introduction;
@@ -38,11 +37,8 @@
private String detailPicture;
- @ApiModelProperty(value = "现金支付（0=否，1=是）")
- private Integer cashPayment;
-
- @ApiModelProperty(value = "积分支付（0=否，1=是）")
- private Integer pointPayment;
+ @ApiModelProperty(value = "详情图，多个逗号分隔")
+ private Integer goodsCategoryId;
@ApiModelProperty(value = "基础积分")
private Integer integral;
@@ -59,15 +55,38 @@
@ApiModelProperty(value = "门店id")
private Integer shopId;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "活动开始时间")
private LocalDateTime startTime;
@ApiModelProperty(value = "活动结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
- @ApiModelProperty(value = "门店列表")
- private List<Shop> shopList;
+
+ @ApiModelProperty(value = "状态（1=下架，2=上架）")
+ private Integer status;
+ @ApiModelProperty(value = "商品售价（编辑商品）")
+ private BigDecimal editPrice;
+ @ApiModelProperty(value = "限购数量（编辑商品）")
+ private Integer editNum;
+
+ @ApiModelProperty(value = "是否秒杀活动,0-否，1-是")
+ private Integer isSkillActivity;
+
+
+ @ApiModelProperty(value = "活动限购数量（编辑商品）")
+ private Integer editActivityNum;
+
+ @ApiModelProperty(value = "活动价格（编辑商品）")
+ private BigDecimal editActivityPrice;
+
+ @ApiModelProperty(value = "门店")
+ private Shop shop;
+
+ @ApiModelProperty(value = "评价")
+ private GoodsEvaluate goodsEvaluate;
}
--
Gitblit v1.7.1