From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 11 六月 2024 18:18:05 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java | 11 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 79 ++++++--
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BaanerListDTO.java | 12 +
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 4
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java | 6
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java | 3
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java | 24 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java | 11 +
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java | 5
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java | 6
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartMemberAuctionCollectionController.java | 4
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java | 8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java | 17 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java | 14 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java | 10 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java | 26 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java | 19 ++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java | 13
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/LogisticsDTO.java | 14 +
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java | 10 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java | 13 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java | 21 ++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java | 21 ++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java | 7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 31 +++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java | 37 +++-
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java | 7
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java | 11 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/Express100VO.java | 15 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java | 24 ++
35 files changed, 430 insertions(+), 68 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BaanerListDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BaanerListDTO.java
new file mode 100644
index 0000000..fec9969
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/BaanerListDTO.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.api.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "Baaner数据传输对象", description = "Baaner数据传输对象")
+public class BaanerListDTO {
+ @ApiModelProperty(value = "轮播图类型 1=商城首页 2=资讯首页")
+ private Integer bannerType;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/LogisticsDTO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/LogisticsDTO.java
new file mode 100644
index 0000000..f268188
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/dto/LogisticsDTO.java
@@ -0,0 +1,14 @@
+package com.ruoyi.system.api.domain.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "物流订单查询", description = "物流订单查询")
+public class LogisticsDTO {
+ @ApiModelProperty(value = "快递公司编号")
+ private String company ;
+ @ApiModelProperty(value = "物流订单号")
+ private String postid ;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
index 89644e6..5216ce4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionBidRecordVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,18 +11,23 @@
@Data
public class AuctionBidRecordVO {
@ApiModelProperty("排序")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer sort;
@ApiModelProperty(value = "会员id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long memberId;
@ApiModelProperty(value = "会员名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String memberName;
@ApiModelProperty(value = "最终出价时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime lastBidTime;
@ApiModelProperty(value = "最终出价金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal lastBidAmount;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
index 0787e5d..02ad0b2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,28 +34,38 @@
private AuctionStartStatusEnum startStatus;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "是中标 1未中标，2中标")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isStatus;
@ApiModelProperty(value = "商品年份")
private String years;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
+ @ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isCollection;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
index 8564a4c..4b3e1f7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -13,92 +14,118 @@
public class AuctionGoodsinfoVO {
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsSkuName;
@ApiModelProperty(value = "起拍价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal startingPrice;
@ApiModelProperty(value = "拍品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer salesroomStock;
@ApiModelProperty(value = "开始状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionStartStatusEnum startStatus;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品分类")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String category;
@ApiModelProperty(value = "商品系列")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String series;
@ApiModelProperty(value = "商品品牌")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String brand;
@ApiModelProperty(value = "商品香型")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String flavorType;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "是否出价 1未出价，2出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
@ApiModelProperty(value = "是中标 1未中标，2中标")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isStatus;
@ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isCollection;
@ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuthenticationEnum authentication;
@ApiModelProperty("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isApply;
@ApiModelProperty(value = "当前出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal presentBid;
@ApiModelProperty(value = "最低加价金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal minimumMarkupAmount;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "分享标题")
- @TableField("share_title")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
- @TableField("share_pic")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
index 2692e09..115098d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,79 +14,104 @@
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsSkuName;
@ApiModelProperty(value = "起拍价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal startingPrice;
@ApiModelProperty(value = "拍品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer salesroomStock;
@ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer SalesroomType;
@ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer goodsSkustatus;
@ApiModelProperty(value = "拍卖时间（分钟）")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer listingDuration;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品分类")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String category;
@ApiModelProperty(value = "商品系列")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String series;
@ApiModelProperty(value = "商品品牌")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String brand;
@ApiModelProperty(value = "商品香型")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String flavorType;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "是否出价 1未出价，2出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
@ApiModelProperty(value = "是中标 1未中标，2中标")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isStatus;
@ApiModelProperty(value = "当前出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal presentBid;
@ApiModelProperty(value = "最低加价金额")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal minimumMarkupAmount;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
index 38c45c3..d1e452b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,36 +11,46 @@
@Data
public class AuctionSalesroomVO {
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer status;
@ApiModelProperty(value = "拍卖场说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "拍卖场封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "当前拍卖的商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods;
@ApiModelProperty(value = "下拍卖的商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ForepartAuctionSalesroomGoodsVO nextAuctionSalesroomGoods;
@ApiModelProperty(value = "其他的商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private List<ForepartAuctionSalesroomGoodsVO> elseAuctionSalesroomGoods;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/Express100VO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/Express100VO.java
new file mode 100644
index 0000000..24d2235
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/Express100VO.java
@@ -0,0 +1,15 @@
+package com.ruoyi.system.api.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class Express100VO {
+ private String message;
+ private String nu;
+ private String ischeck;
+ private String com;
+ private String status;
+ private List<LogisticsInfoVO> data;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
index db1b9b9..2c50b1b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,63 +13,83 @@
public class ForepartAuctionSalesroomGoodsVO {
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsSkuName;
@ApiModelProperty(value = "起拍价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal startingPrice;
@ApiModelProperty(value = "拍品数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer salesroomStock;
@ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer SalesroomType;
@ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private AuctionGoodsStatusEnum goodsSkustatus;
@ApiModelProperty(value = "拍卖时间（分钟）")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer listingDuration;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@ApiModelProperty(value = "下一个商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String nextGoodsSkuName;
@ApiModelProperty(value = "是否出价 1未出价，2出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
@ApiModelProperty(value = "是中标 1未中标，2中标")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isStatus;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java
index 4b3aefb..cfd6f9b 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomVO.java
@@ -1,13 +1,16 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class ForepartAuctionSalesroomVO {
@ApiModelProperty(value = "暖场视频or封面海报")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String url;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer auctionSalesroomStatus;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
index 7d14c0b..e9ea9e4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/GoodsGroupPurchaseInfoVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.ListingStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
@@ -13,59 +14,77 @@
@Data
public class GoodsGroupPurchaseInfoVO {
@ApiModelProperty(value = "团购商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsSkuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
@ApiModelProperty(value = "团购价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal groupPurchasePrice;
@ApiModelProperty(value = "成团人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer groupSize;
@ApiModelProperty(value = "限购数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer limitNumber;
@ApiModelProperty(value = "当前人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer currentNumber;
@ApiModelProperty(value = "团购开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "团购结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "参团说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "开始状态 0=未开始 1=已开始 2=已结束 ")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private StartStatusEnum startStatus;
@ApiModelProperty(value = "上架状态 0=已上架 1=已下架")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private ListingStatusEnum listingStatus;
@ApiModelProperty(value = "成团状态 0=待成团 1=已成团 2=成团失败")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private GroupStatusEnum groupStatus;
@ApiModelProperty(value = "是团购 1没有团购，2有团购")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isGoodsGroupPurchase;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java
index b6d84ad..a81eb87 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillInfoVO.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,65 +15,83 @@
@Data
public class HomeGoodsSeckillInfoVO {
@ApiModelProperty(value = "秒杀商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品分类")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String category;
@ApiModelProperty(value = "商品系列")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String series;
@ApiModelProperty(value = "商品品牌")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String brand;
@ApiModelProperty(value = "商品香型")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String flavorType;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
-
-
@ApiModelProperty(value = "限购数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer limitNumber;
@ApiModelProperty(value = "秒杀价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal seckillPrice;
@ApiModelProperty(value = "秒杀开始时间")
@@ -84,5 +103,6 @@
private LocalDateTime endTime;
@ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private StartStatusEnum startStatus;
}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java
index 99b40fa..2ef74f3 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSeckillVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,38 +13,48 @@
@Data
public class HomeGoodsSeckillVO {
@ApiModelProperty(value = "秒杀商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
@TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "秒杀价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal seckillPrice;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "秒杀开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "秒杀结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
index 84de4f7..1e38e04 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,63 +15,83 @@
private Long id;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品分类")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String category;
@ApiModelProperty(value = "商品系列")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String series;
@ApiModelProperty(value = "商品品牌")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String brand;
@ApiModelProperty(value = "商品香型")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String flavorType;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "库存")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer stock;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@ApiModelProperty(value = "排序")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer sortNum;
@ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isCollection;
@ApiModelProperty(value = "是团购 1没有团购，2有团购")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
index a2dc24c..480389f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,37 +17,48 @@
private Long id;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isCollection;
- @ApiModelProperty(value = "1是普通商品，2 团购商品，3 秒杀商品")
+ @ApiModelProperty(value = "1是普通商品，2 秒杀商品，3 团购商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer type;
@ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private StartStatusEnum startStatus;
@ApiModelProperty(value = "开始时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = " 销售价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal xiaosPrice;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java
new file mode 100644
index 0000000..0f8a937
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/LogisticsInfoVO.java
@@ -0,0 +1,10 @@
+package com.ruoyi.system.api.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class LogisticsInfoVO {
+ private String time;
+ private String ftime;
+ private String context;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
index 7e069ae..8b20711 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdGoodsGroupPurchaseVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.GroupStatusEnum;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
@@ -13,46 +14,60 @@
public class WdGoodsGroupPurchaseVO {
@ApiModelProperty(value = "团购商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long Id;
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String goodsSkuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "团购价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal groupPurchasePrice;
@ApiModelProperty(value = "成团人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer groupSize;
@ApiModelProperty(value = "当前人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer currentNumber;
@ApiModelProperty(value = "团购开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "团购结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "开始状态 0=未开始 1=已开始 2=已结束 ")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private StartStatusEnum startStatus;
@ApiModelProperty(value = "成团状态 0=待成团 1=已成团 2=成团失败")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private GroupStatusEnum groupStatus;
@ApiModelProperty(value = "是团购 1没有团购，2有团购")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isGoodsGroupPurchase;
-}
+}
\ No newline at end of file
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
index 9b6a31c..c4846b4 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
public class WdMemberAuctionSalesroomVO {
@@ -27,4 +28,16 @@
@ApiModelProperty(value = "加入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime BondTime;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal bond;
+
+
+ @ApiModelProperty(value = "人数")
+ private Integer bondNum;
+
+ @ApiModelProperty(value = "是否参加， 1否，2 是")
+ private Integer isBond;
+
+
}
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
index 8be13cc..ed62a7f 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/controller/forepart/vo/MemberArticleCollectionVO.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "头像")
private String memberAvatar;
- @ApiModelProperty("是否收藏 1收藏， 2 未收藏")
+ @ApiModelProperty("是否收藏 1未收藏， 2 收藏")
private Integer isCollect;
@ApiModelProperty(value = "创建时间")
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
index 425bbdf..102a5e4 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/service/impl/MemberArticleCollectionServiceImpl.java
@@ -119,7 +119,7 @@
Member data = membeOne.getData();
memberArticleCollectionVO.setMemberNickname(data.getNickname());
memberArticleCollectionVO.setMemberAvatar(data.getAvatar());
- memberArticleCollectionVO.setIsCollect(1);
+ memberArticleCollectionVO.setIsCollect(2);
}
return articleCommentsVOPageDTO;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
index 01dd53a..c9da187 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartAuctionSalesroomController.java
@@ -23,6 +23,8 @@
import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
/**
* <p>
* 拍卖场表 前端控制器
@@ -47,9 +49,9 @@
* 拍卖大屏获取拍卖信息
*
*/
- @PostMapping("getAuctionBidRecordList")
+ @PostMapping("/getAuctionBidRecordList")
@ApiOperation(value = "拍卖大屏-获取拍卖信息")
- public R<PageDTO<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
+ public R<List<AuctionSalesroom>> getAuctionBidRecordList(@RequestBody AuctionSalesroomDTO ctionSalesroomGoodsDTO) {
return R.ok(iAuctionSalesroomService.getAuctionBidRecordList(ctionSalesroomGoodsDTO));
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartMemberAuctionCollectionController.java
similarity index 91%
rename from ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java
rename to ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartMemberAuctionCollectionController.java
index a30418a..3f12477 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/MemberAuctionCollectionController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/forepart/ForepartMemberAuctionCollectionController.java
@@ -5,11 +5,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.dto.AuctionCollectionDTO;
-import com.ruoyi.system.api.domain.dto.AuctionGoodsListDTO;
import com.ruoyi.system.api.domain.vo.AuctionGoodsListVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.poi.ss.formula.functions.T;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -25,7 +23,7 @@
@RestController
@RequestMapping("/member-auction-collection")
@Api(value = "用户收藏的普通拍卖商品相关接口", tags = "用户收藏的普通拍卖商品相关接口", description = "用户收藏的普通拍卖商品相关接口")
-public class MemberAuctionCollectionController {
+public class ForepartMemberAuctionCollectionController {
@Resource
private IMemberAuctionCollectionService memberAuctionCollectionService;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
index 7b18151..07c10bb 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java
@@ -44,7 +44,7 @@
* 拍卖大屏获取拍卖信息
*
*/
- PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO);
+ List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO);
/**
* 暖场视频or封面海报
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
index e731039..4e9ab5d 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionBrowseRecordServiceImpl.java
@@ -27,6 +27,7 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -65,16 +66,16 @@
LocalDateTime newTime7 = now.minusDays(7);
LambdaQueryWrapper<AuctionBrowseRecord> wrapper3= Wrappers.lambdaQuery();
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
- wrapper3.eq(AuctionBrowseRecord::getTargetId,auctionGoodsListDTO.getGoodsSkuId());
+ wrapper3.eq(AuctionBrowseRecord::getBrowseType,1);
wrapper3.eq(AuctionBrowseRecord::getMemberId,auctionGoodsListDTO.getMemberId());
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
-
+ Set<Long> goodsSkuIdList = new HashSet<>();
List<AuctionBrowseRecord> list = this.list(wrapper3);
- Set<Long> goodsSkuIdList = null;
- goodsSkuIdList = list.stream().map(AuctionBrowseRecord::getTargetId)
- .collect(Collectors.toSet());
-
+ for (AuctionBrowseRecord auctionBrowseRecord:list){
+ AuctionGoods auctionGoods = auctionGoodsMapper.selectById(auctionBrowseRecord.getTargetId());
+ goodsSkuIdList.add(auctionGoods.getGoodsSkuId());
+ }
Set<Long> goodsSkuIdList1 = null;
if (StringUtils.isNotEmpty(auctionGoodsListDTO.getGoodsSkuName())) {
List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionGoodsListDTO.getGoodsSkuName(),
@@ -84,17 +85,25 @@
.collect(Collectors.toSet());
}
Set<Long> goodsSkuIdList2 =null;
- if (goodsSkuIdList1.size()==0){
+ if (StringUtils.isNotEmpty(goodsSkuIdList1)){
goodsSkuIdList.retainAll(goodsSkuIdList1);
goodsSkuIdList2=goodsSkuIdList;
}else {
goodsSkuIdList2=goodsSkuIdList;
}
+
+
Page<AuctionGoodsListVO> page = new Page<>();
page.setSize(auctionGoodsListDTO.getPageSize());
page.setCurrent(auctionGoodsListDTO.getPageCurr());
AuctionGoodsListPageDTO auctionGoodsListPageDTO=new AuctionGoodsListPageDTO();
- auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ if (StringUtils.isNotEmpty(goodsSkuIdList2)){
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ }else{
+ goodsSkuIdList2=new HashSet<>();
+ goodsSkuIdList2.add(0L);
+ auctionGoodsListPageDTO.setGoodsSkuIdList(goodsSkuIdList2);
+ }
List<AuctionGoods> auctionGoodsPgeList = auctionGoodsMapper.getAuctionGoodsPgeList(page, auctionGoodsListPageDTO);
List<AuctionGoodsListVO> auctionGoodsVOS=new ArrayList<>();
for (AuctionGoods auctionGoods:auctionGoodsPgeList){
@@ -129,6 +138,7 @@
wrapper3.eq(AuctionBrowseRecord::getDelFlag,0);
wrapper3.eq(AuctionBrowseRecord::getTargetId,MemberAuctionSalesroomDTO.getAuctionSalesroomId());
wrapper3.eq(AuctionBrowseRecord::getMemberId,MemberAuctionSalesroomDTO.getMemberId());
+ wrapper3.eq(AuctionBrowseRecord::getBrowseType,2);
wrapper3.ge(AuctionBrowseRecord::getCreateTime, newTime7)
.le(AuctionBrowseRecord::getCreateTime, now);
@@ -156,7 +166,16 @@
memberAuctionSalesroomDTO1.setAuctionSalesroomId(auctionSalesroom.getId());
memberAuctionSalesroomDTO1.setMemberId(MemberAuctionSalesroomDTO.getMemberId());
List<OrderAuctionBond> data1 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO1, SecurityConstants.INNER).getData();
- memberAuctionSalesroomVO.setBondTime(data1.get(0).getCreateTime());
+ if (data1.size()>0){
+ memberAuctionSalesroomVO.setIsBond(2);
+ }else{
+ memberAuctionSalesroomVO.setIsBond(1);
+ }
+ MemberAuctionSalesroomDTO memberAuctionSalesroomDTO2=new MemberAuctionSalesroomDTO();
+ memberAuctionSalesroomDTO2.setAuctionSalesroomId(auctionSalesroom.getId());
+ List<OrderAuctionBond> data2 = orderClient.getOrderAuctionBondList1(memberAuctionSalesroomDTO2, SecurityConstants.INNER).getData();
+ memberAuctionSalesroomVO.setBondNum(data2.size());
+ memberAuctionSalesroomVO.setBond(auctionSalesroom.getBond());
List.add(memberAuctionSalesroomVO);
}
page.setRecords(List);
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
index fed4c43..9401896 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java
@@ -203,33 +203,64 @@
wrapper.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper);
ForepartAuctionSalesroomGoodsVO currentAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
- R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
- auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
- GoodsSku goodsSku=goodsSkuOne.getData();
- currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName());
- currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
- currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime());
- currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration());
- auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
-
- list.add(auctionSalesroomGoods.getSortNum());
-
+ if (auctionSalesroomGoods!=null){
+ R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
+ auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
+ GoodsSku goodsSku=goodsSkuOne.getData();
+ currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName());
+ currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods.getGoodsSkuId());
+ currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
+ currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus());
+ currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration());
+ auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
+ list.add(auctionSalesroomGoods.getSortNum());
+ }
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
- wrapper1.eq(AuctionSalesroomGoods::getSortNum,auctionSalesroomGoods.getSortNum()+1);
+ wrapper1.eq(AuctionSalesroomGoods::getStatus,0);
+ if (auctionSalesroomGoods!=null) {
+ wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() + 1);
+ list.add(auctionSalesroomGoods.getSortNum()+1);
+ }else{
+ LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=Wrappers.lambdaQuery();
+ wrappers.eq(AuctionSalesroomGoods::getStatus,0);
+ wrappers.eq(AuctionSalesroomGoods::getDelFlag,0);
+ wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
+ wrappers.orderByAsc(AuctionSalesroomGoods::getSortNum);
+ wrappers.last("limit 1");
+ AuctionSalesroomGoods auctionSalesroomGoodss = this.getOne(wrappers);
+ if (auctionSalesroomGoodss!=null){
+ R<GoodsSku> goodsSkuOne = goodsSkuClient.getGoodsSkuOne(
+ auctionSalesroomGoodss.getGoodsSkuId(), SecurityConstants.INNER);
+ GoodsSku goodsSku=goodsSkuOne.getData();
+ currentAuctionSalesroomGoods.setGoodsSkuName(goodsSku.getSkuName());
+ currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getGoodsSkuId());
+ currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
+ currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus());
+ currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration());
+ auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
+ }
+ wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum());
+ list.add(auctionSalesroomGoodss.getSortNum());
+ }
wrapper1.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods1 = this.getOne(wrapper1);
ForepartAuctionSalesroomGoodsVO nextAuctionSalesroomGoods= new ForepartAuctionSalesroomGoodsVO();
if (auctionSalesroomGoods1!=null){
- list.add(auctionSalesroomGoods.getSortNum()+1);
+
R<GoodsSku> goodsSkuOne1 = goodsSkuClient.getGoodsSkuOne(
- auctionSalesroomGoods.getGoodsSkuId(), SecurityConstants.INNER);
+ auctionSalesroomGoods1.getGoodsSkuId(), SecurityConstants.INNER);
GoodsSku goodsSku1=goodsSkuOne1.getData();
nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName());
nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic());
+ nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus());
+ nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getGoodsSkuId());
auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods);
}
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
+ wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list);
wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
@@ -243,6 +274,7 @@
GoodsSku goodsSku2=goodsSkuOne2.getData();
forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName());
forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic());
+ forepartAuctionSalesroomGoodsVO1.setGoodsSkuId(salesroomGoods.getGoodsSkuId());
forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus());
auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1);
}
@@ -365,7 +397,7 @@
@Override
public List<AuctionSalesroomGoods> isAuctionSalesroom(AuctionSalesroomDTO ationSalesroomGoodsDTO) {
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
- wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
+ wrapper2.eq(AuctionSalesroomGoods::getStatus,1);
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper2);
@@ -387,7 +419,7 @@
auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
this.updateById(auctionSalesroomGoods);
- Map<String, Object> map = new ConcurrentHashMap<>();
+ /* Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS);
map.put("notification_time", LocalDateTime.now());
map.put("goodsSkuId", auctionSalesroomGoods.getId());
@@ -398,7 +430,7 @@
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
- WebSocketUsers.sendMessageToUsersByText(msg);
+ WebSocketUsers.sendMessageToUsersByText(msg);*/
}
@@ -413,10 +445,9 @@
wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,auctionSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getGoodsSkuId,auctionSalesroomGoodsDTO.getGoodsSkuId());
- AuctionSalesroomGoods auctionSalesroomGood=this.getOne(wrapper2);
- AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGood.getAuctionSalesroomId());
+ AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
+ AuctionSalesroom auctionSalesroom=iAuctionSalesroomService.getById(auctionSalesroomGoodsDTO.getAuctionSalesroomId());
- AuctionSalesroomGoods auctionSalesroomGoods=this.getById(auctionSalesroomGoodsDTO.getGoodsSkuId());
List<AuctionBidRecord> auctionBidRecordList=new ArrayList<>();
if (auctionSalesroomGoods.getStatus().getCode()==1) {
@@ -453,10 +484,10 @@
}
}
- auctionSalesroomGood.setStatus(AuctionGoodsStatusEnum.ENDED);
- this.updateById(auctionSalesroomGood);
+ auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.ENDED);
+ this.updateById(auctionSalesroomGoods);
- Map<String, Object> map = new ConcurrentHashMap<>();
+ /* Map<String, Object> map = new ConcurrentHashMap<>();
map.put("notification_type", NotificationTypeConstant.AUCTION_SALESROOM_GOODS);
map.put("notification_time", LocalDateTime.now());
map.put("goodsSkuId", auctionSalesroomGoods.getId());
@@ -467,7 +498,7 @@
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
- WebSocketUsers.sendMessageToUsersByText(msg);
+ WebSocketUsers.sendMessageToUsersByText(msg);*/
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
index 3795fb8..1021e7c 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java
@@ -201,13 +201,12 @@
@Override
- public PageDTO<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO) {
- Page<AuctionSalesroom> page = new Page<>(ationSalesroomGoodsDTO.getPageCurr(), ationSalesroomGoodsDTO.getPageSize());
+ public List<AuctionSalesroom> getAuctionBidRecordList(AuctionSalesroomDTO ationSalesroomGoodsDTO) {
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getSalesroomName,ationSalesroomGoodsDTO.getSalesroomName());
wrapper.eq(AuctionSalesroom::getDelFlag,0);
- Page<AuctionSalesroom> page1 = this.page(page, wrapper);
- return PageDTO.of(page1);
+ List<AuctionSalesroom> page1 = this.list(wrapper);
+ return page1;
}
@Override
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
index 3b3794b..1df4496 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/MemberAuctionCollectionServiceImpl.java
@@ -4,7 +4,9 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.auction.domain.AuctionBidRecord;
import com.ruoyi.auction.domain.MemberAuctionCollection;
+import com.ruoyi.auction.mapper.AuctionBidRecordMapper;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.mapper.MemberAuctionCollectionMapper;
import com.ruoyi.auction.service.IMemberAuctionCollectionService;
@@ -40,6 +42,9 @@
private GoodsSkuClient goodsSkuClient;
@Resource
private AuctionGoodsMapper auctionGoodsMapper;
+
+ @Resource
+ private AuctionBidRecordMapper auctionBidRecordMapper;
@Override
@@ -111,9 +116,28 @@
GoodsSku goodsSkuOne = goodsSkuClient.getGoodsSkuOne(auctionGoods.getGoodsSkuId(), SecurityConstants.INNER).getData();
auctionGoodsVO.setUnit(goodsSkuOne.getUnit());
auctionGoodsVO.setSpec(goodsSkuOne.getSpec());
+ auctionGoodsVO.setIsCollection(2);
auctionGoodsVO.setSpecUnit(goodsSkuOne.getSpecUnit());
auctionGoodsVO.setGoodsSkuName(goodsSkuOne.getSkuName());
auctionGoodsVO.setCoverPic(goodsSkuOne.getCoverPic());
+
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
+ wrapper1.eq(AuctionBidRecord::getMemberId,auctionCollectionDTO.getMemberId());
+ wrapper1.eq(AuctionBidRecord::getAuctionType,1);
+ wrapper1.eq(AuctionBidRecord::getTargetId,auctionGoods.getId());
+ wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list1 = auctionBidRecordMapper.selectOne(wrapper1);
+ if (list1!=null){
+ if (list1.getStatus().getCode()==2){
+ auctionGoodsVO.setIsStatus(2);
+ }else{
+ auctionGoodsVO.setIsStatus(1);
+ }
+ }else{
+ auctionGoodsVO.setIsStatus(1);
+ }
+
auctionGoodsVOS.add(auctionGoodsVO);
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
index f58f938..2102ce6 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java
@@ -60,7 +60,7 @@
@TableLogic
private Integer delFlag;
- @ApiModelProperty(value = "1是普通商品，2 团购商品，3 秒杀商品")
+ @ApiModelProperty(value = "1是普通商品，2秒杀商品，3 团购商品")
private Integer type;
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
index 4a04dfa..340e4af 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsBrowseRecordServiceImpl.java
@@ -42,8 +42,6 @@
@Override
public PageDTO<HomeGoodsSkuListVO> geBrowseRecordList(AuctionCollectionDTO auctionCollectionDTO) {
-
-
Set<Long> goodsSkuIdList1 = null;
if (StringUtils.isNotEmpty(auctionCollectionDTO.getGoodsSkuName())) {
List<GoodsSku> goodsSku = goodsSkuClient.getGoodsByName(auctionCollectionDTO.getGoodsSkuName(),
@@ -58,7 +56,9 @@
page.setCurrent(auctionCollectionDTO.getPageCurr());
LambdaQueryWrapper<GoodsBrowseRecord> wrapper= Wrappers.lambdaQuery();
wrapper.eq(GoodsBrowseRecord::getMemberId,auctionCollectionDTO.getMemberId());
- wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1);
+ if (StringUtils.isNotEmpty(goodsSkuIdList1)){
+ wrapper.in(GoodsBrowseRecord::getGoodsSkuId,goodsSkuIdList1);
+ }
List<GoodsBrowseRecord> list = this.list(wrapper);
List<HomeGoodsSkuListVO> auctionGoodsVOS=new ArrayList<>();
@@ -70,6 +70,7 @@
auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
+ auctionGoodsVOS.add(auctionGoodsVO);
}
page.setRecords(auctionGoodsVOS);
return PageDTO.of(page);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
index b5c3e66..0a91a58 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java
@@ -376,7 +376,9 @@
.collect(Collectors.toList());
Page<GoodsGroupPurchase> page = new Page<>(homeGoodsSkuDTO.getPageCurr(), homeGoodsSkuDTO.getPageSize());
LambdaQueryWrapper< GoodsGroupPurchase> wrapper= Wrappers.lambdaQuery();
- wrapper.in(GoodsGroupPurchase::getGoodsSkuId,goodsSkuIdList);
+ if (homeGoodsSkuDTO.getSkuName()!=null){
+ wrapper.in(GoodsGroupPurchase::getId,goodsSkuIdList);
+ }
wrapper.eq(GoodsGroupPurchase::getListingStatus,0);
wrapper.eq( GoodsGroupPurchase::getDelFlag,0);
Page< GoodsGroupPurchase> page1 = this.page(page, wrapper);
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
index d9ebce2..b2a3003 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/MemberGoodsCollectionServiceImpl.java
@@ -119,13 +119,14 @@
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
auctionGoodsVO.setIsCollection(2);
+ auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
} if(auctionCollection.getType()==2){
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSeckill goodsSeckill = goodsSeckillMapper.selectById(auctionCollection.getTargetId());
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsSeckill.getGoodsSkuId());
auctionGoodsVO.setId(auctionCollection.getTargetId());
- auctionGoodsVO.setPrice(goodsSku.getPrice());
+ auctionGoodsVO.setPrice( goodsSeckill.getSeckillPrice());
auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
@@ -133,22 +134,24 @@
auctionGoodsVO.setStartStatus(goodsSeckill.getStartStatus());
auctionGoodsVO.setStartTime(goodsSeckill.getStartTime());
auctionGoodsVO.setEndTime(goodsSeckill.getEndTime());
- auctionGoodsVO.setXiaosPrice(goodsSeckill.getSeckillPrice());
+ auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
+ auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
- } if(auctionCollection.getType()==1){
+ } if(auctionCollection.getType()==3){
GoodsGroupPurchase goodsGroupPurchase = goodsGroupPurchaseMapper.selectById(auctionCollection.getTargetId());
HomeGoodsSkuListVO auctionGoodsVO=new HomeGoodsSkuListVO();
GoodsSku goodsSku = goodsSkuMapper.selectById(goodsGroupPurchase.getGoodsSkuId());
auctionGoodsVO.setId(auctionCollection.getTargetId());
- auctionGoodsVO.setPrice(goodsSku.getPrice());
+ auctionGoodsVO.setPrice(goodsGroupPurchase.getGroupPurchasePrice());
auctionGoodsVO.setCoverPic(goodsSku.getCoverPic());
auctionGoodsVO.setSkuName(goodsSku.getSkuName());
auctionGoodsVO.setSoldQuantity(goodsSku.getSoldQuantity());
auctionGoodsVO.setIsCollection(2);
- auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice());
+ auctionGoodsVO.setXiaosPrice(goodsSku.getPrice());
auctionGoodsVO.setStartTime(goodsGroupPurchase.getStartTime());
auctionGoodsVO.setEndTime(goodsGroupPurchase.getEndTime());
auctionGoodsVO.setXiaosPrice(goodsGroupPurchase.getGroupPurchasePrice());
+ auctionGoodsVO.setType(auctionCollection.getType());
auctionGoodsVOS.add(auctionGoodsVO);
}
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
index df56a7f..352b823 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberLevelServiceImpl.java
@@ -1,5 +1,7 @@
package com.ruoyi.member.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
@@ -7,6 +9,7 @@
import com.ruoyi.member.controller.management.vo.MgtMemberLevelVO;
import com.ruoyi.member.domain.MemberLevel;
import com.ruoyi.member.mapper.MemberLevelMapper;
+import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberLevelService;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.member.service.async.AsyncMethodService;
@@ -31,7 +34,7 @@
@RequiredArgsConstructor
public class MemberLevelServiceImpl extends ServiceImpl<MemberLevelMapper, MemberLevel> implements IMemberLevelService {
- private final IMemberService memberService;
+ private final MemberMapper memberMapper;
private final AsyncMethodService asyncMethodService;
/**
* 获取会员等级管理列表
@@ -42,7 +45,8 @@
public List<MgtMemberLevelVO> getMemberLevelList() {
List<MemberLevel> list = this.lambdaQuery().orderByAsc(MemberLevel::getLevel).list();
List<MgtMemberLevelVO> mgtMemberLevelVOS = BeanUtils.copyList(list, MgtMemberLevelVO.class);
- List<Member> memberList = memberService.list();
+ LambdaQueryWrapper<Member> wrapper= Wrappers.lambdaQuery();
+ List<Member> memberList = memberMapper.selectList(wrapper);
Integer level = 0;
if (StringUtils.isNotEmpty(mgtMemberLevelVOS)) {
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
index 1d500f6..be3b6b2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/MemberServiceImpl.java
@@ -31,6 +31,7 @@
import com.ruoyi.member.controller.management.vo.MgtMemberPointsVO;
import com.ruoyi.member.controller.management.vo.MgtMemberVO;
import com.ruoyi.member.domain.MemberLevel;
+import com.ruoyi.member.mapper.MemberLevelMapper;
import com.ruoyi.member.mapper.MemberMapper;
import com.ruoyi.member.service.IMemberLevelService;
import com.ruoyi.member.service.IMemberPointsService;
@@ -132,7 +133,7 @@
private RedisService redisService;
@Resource
- private IMemberLevelService iMemberLevelService;
+ private MemberLevelMapper memberLevelMapper;
@Resource
@@ -525,8 +526,8 @@
}
}
this.updateById(byId);
-
- List<MemberLevel> list = iMemberLevelService.list();
+ LambdaQueryWrapper<MemberLevel> wrapper= Wrappers.lambdaQuery();
+ List<MemberLevel> list = memberLevelMapper.selectList(wrapper);
for (int i=0;i<list.size();i++){
if (i==0){
int ia = byId.getMoney().compareTo(list.get(0).getCumulativeConsumption());
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
index 4d8040b..46babd0 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/forepart/ForepartLogisticsController.java
@@ -2,10 +2,14 @@
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.order.domain.MemberInvoice;
import com.ruoyi.order.dto.MemberInvoiceDTO;
import com.ruoyi.order.service.ILogisticsService;
import com.ruoyi.order.service.impl.LogisticsServiceImpl;
import com.ruoyi.system.api.domain.Logistics;
+import com.ruoyi.system.api.domain.dto.LogisticsDTO;
+import com.ruoyi.system.api.domain.vo.Express100VO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,4 +40,10 @@
return R.ok();
}
+ @PostMapping("/getLogisticsList")
+ @ApiOperation(value = "用户端-获取快递信息")
+ public R<Express100VO> getLogisticsList(@RequestBody LogisticsDTO logisticsDTO) {
+ return R.ok(iLogisticsService.getLogisticsList(logisticsDTO));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
index 9d1bf99..fcc7823 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/forepart/ForepartPromotionBannerController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.promotion.domain.PromotionBanner;
import com.ruoyi.promotion.service.IPromotionBannerService;
+import com.ruoyi.system.api.domain.dto.BaanerListDTO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import java.util.List;
@@ -28,8 +29,8 @@
private IPromotionBannerService iPromotionBannerService;
@PostMapping("/getBaanerList")
@ApiOperation(value = "用户端-商场或者资讯的轮播图")
- public R<List<PromotionBanner>> getBaanerList(@PathVariable("bannerType") Integer bannerType) {
- return R.ok(iPromotionBannerService.getBaanerList(bannerType));
+ public R<List<PromotionBanner>> getBaanerList(@RequestBody BaanerListDTO bannerType) {
+ return R.ok(iPromotionBannerService.getBaanerList(bannerType.getBannerType()));
}
}
--
Gitblit v1.7.1