From e40c0643e26447d89f50c0118da13dba80684089 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 30 五月 2024 14:50:26 +0800
Subject: [PATCH] 1.清除所有冗余字段 2.提交【管理后台】-拍卖场管理 添加/编辑接口
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java | 70 ++++++++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java | 11 ++
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java | 7 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 21 +++-
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroom.java | 2
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 21 +--
ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberLike.java | 9 +
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java | 2
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 65 ++++++++++++
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java | 45 +++++++++
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsGroupPurchaseServiceImpl.java | 6 +
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionGoods.java | 3
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/IAuctionSalesroomService.java | 2
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchase.java | 4
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java | 3
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/MemberGoodsCollection.java | 4
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java | 3
18 files changed, 240 insertions(+), 40 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionGoods.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionGoods.java
index 0369658..6ec60af 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionGoods.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionGoods.java
@@ -42,9 +42,6 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
- @ApiModelProperty(value = "商品名称")
- private String goodsSkuName;
-
@ApiModelProperty(value = "起拍价格")
private BigDecimal startingPrice;
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroom.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroom.java
index 7d82062..fb00458 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroom.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/AuctionSalesroom.java
@@ -51,7 +51,7 @@
private AuctionTypeEnum type;
@ApiModelProperty(value = "保证金")
- private BigDecimal bound;
+ private BigDecimal bond;
@ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
private AuthenticationEnum authentication;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java
index 0a20b0b..6e207b9 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberArticleCollection.java
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
diff --git a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberLike.java b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberLike.java
index 0b1faa9..f05c897 100644
--- a/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberLike.java
+++ b/ruoyi-modules/ruoyi-article/src/main/java/com/ruoyi/article/domain/MemberLike.java
@@ -1,6 +1,11 @@
package com.ruoyi.article.domain;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -27,7 +32,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "会员id")
private Long memberId;
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
index 8fe2c7b..1036bc4 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/MgtAuctionSalesroomController.java
@@ -1,6 +1,7 @@
package com.ruoyi.auction.controller.management;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.service.IAuctionSalesroomService;
@@ -10,9 +11,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -62,4 +65,12 @@
return R.fail();
}
}
+
+ @PostMapping("/save")
+ @ApiOperation(value = "添加/编辑 拍卖场", notes = "添加/编辑 拍卖场")
+ public R<?> saveAuctionSalesroom(
+ @Validated @RequestBody MgtAuctionSalesroomDTO dto) {
+ auctionSalesroomService.saveAuctionSalesroom(dto);
+ return R.ok();
+ }
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
new file mode 100644
index 0000000..8a62f07
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomDTO.java
@@ -0,0 +1,70 @@
+package com.ruoyi.auction.controller.management.dto;
+
+import com.ruoyi.common.core.enums.AuctionTypeEnum;
+import com.ruoyi.common.core.enums.AuthenticationEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author mitao
+ * @date 2024/5/30
+ */
+@Data
+@ApiModel(value = "拍卖场数据传输对象", description = "拍卖场数据传输对象")
+public class MgtAuctionSalesroomDTO implements Serializable {
+
+ private static final long serialVersionUID = 1231049127193439373L;
+
+ @ApiModelProperty(value = "拍卖场id", notes = "添加不传，更新必传")
+ private Long id;
+
+ @ApiModelProperty(value = "拍卖场名称")
+ @NotBlank(message = "拍卖场名称不能为空")
+ private String salesroomName;
+
+ @ApiModelProperty(value = "拍卖类型 0=线下拍卖 1=线上线下结合")
+ @NotNull(message = "拍卖类型不能为空")
+ private AuctionTypeEnum type;
+
+ @ApiModelProperty(value = "开始时间")
+ @NotNull(message = "开始时间不能为空")
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "保证金")
+ @NotNull(message = "保证金不能为空")
+ private BigDecimal bond;
+
+ @ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
+ @NotNull(message = "实名认证不能为空")
+ private AuthenticationEnum authentication;
+
+ @ApiModelProperty(value = "拍卖场说明")
+ @NotBlank(message = "拍卖场说明不能为空")
+ private String description;
+
+ @ApiModelProperty(value = "拍卖场封面图")
+ @NotBlank(message = "拍卖场封面图不能为空")
+ private String coverPic;
+
+ @ApiModelProperty(value = "分享标题")
+ @NotBlank(message = "分享标题不能为空")
+ private String shareTitle;
+
+ @ApiModelProperty(value = "分享图片")
+ @NotBlank(message = "分享图片不能为空")
+ private String sharePic;
+
+ @Valid
+ @ApiModelProperty("拍卖商品")
+ @NotEmpty(message = "拍卖商品不能为空")
+ private List<MgtAuctionSalesroomGoodsDTO> auctionSalesroomGoodsDTOS;
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java
new file mode 100644
index 0000000..7c67469
--- /dev/null
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/dto/MgtAuctionSalesroomGoodsDTO.java
@@ -0,0 +1,45 @@
+package com.ruoyi.auction.controller.management.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @author mitao
+ * @date 2024/5/30
+ */
+@Data
+public class MgtAuctionSalesroomGoodsDTO {
+
+ @ApiModelProperty(value = "商品id")
+ @NotNull(message = "商品id不能为空")
+ private Long goodsSkuId;
+
+ @ApiModelProperty(value = "起拍价格")
+ @NotNull(message = "起拍价格不能为空")
+ private BigDecimal startingPrice;
+
+ @ApiModelProperty(value = "最低加价金额")
+ @NotNull(message = "最低加价金额不能为空")
+ private BigDecimal minimumMarkupAmount;
+
+ @ApiModelProperty(value = "拍品数量")
+ @NotNull(message = "拍品数量不能为空")
+ private Integer salesroomStock;
+
+ @ApiModelProperty(value = "兜底成交个数")
+ private Integer guaranteedTradeVolume;
+
+ @ApiModelProperty(value = "拍卖时间（分钟）")
+ @NotNull(message = "拍卖时间不能为空")
+ private Integer listingDuration;
+
+ @ApiModelProperty(value = "设为备选")
+ @NotNull(message = "设为备选不能为空")
+ private Boolean backupStatus;
+
+ @ApiModelProperty(value = "排序")
+ private Integer sortNum;
+
+}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java
index c13bd2b..b204c52 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/domain/MemberAuctionCollection.java
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 1L;
@TableId(value = "id", type = IdType.ASSIGN_ID)
- private Integer id;
+ private Long id;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
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 5c3b972..6a02aec 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
@@ -6,6 +6,7 @@
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -72,4 +73,5 @@
void SaveBid(@RequestBody BidVO BidVO);
+ void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto);
}
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
index 0286509..ef0081e 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionGoodsServiceImpl.java
@@ -7,7 +7,6 @@
import com.ruoyi.auction.controller.management.vo.AuctionBidRecordVO;
import com.ruoyi.auction.controller.management.vo.AuctionGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.auction.mapper.AuctionGoodsMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
import com.ruoyi.auction.service.IAuctionGoodsService;
@@ -21,6 +20,7 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.system.api.domain.AuctionGoods;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.Member;
import com.ruoyi.system.api.domain.MemberAddress;
@@ -122,7 +122,10 @@
throw new ServiceException("拍卖商品不存在");
}
if (auctionGoodsOrg.getStartStatus().equals(AuctionStartStatusEnum.IN_AUCTION)) {
- throw new ServiceException("该商品正在拍卖中，不能修改");
+ throw new ServiceException("商品正在拍卖中不能编辑");
+ }
+ if (auctionGoodsOrg.getStartStatus().equals(AuctionStartStatusEnum.ENDED)) {
+ throw new ServiceException("商品拍卖已结束不能编辑");
}
GoodsSku goodsSku = goodsSkuClient.getGoodsSkuOne(goodsSkuId, SecurityConstants.INNER)
.getData();
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 5ff06a1..f32bac1 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
@@ -6,9 +6,11 @@
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.forepart.dto.AuctionSalesroomGoodsInfoDTO;
import com.ruoyi.auction.controller.forepart.dto.OrderDTO;
-import com.ruoyi.auction.controller.forepart.vo.*;
+import com.ruoyi.auction.controller.forepart.vo.AuctionBidRecordVO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomGoodsInfoVO;
+import com.ruoyi.auction.controller.forepart.vo.AuctionSalesroomVO;
+import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomGoodsVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.auction.domain.AuctionSalesroomGoods;
import com.ruoyi.auction.mapper.AuctionSalesroomGoodsMapper;
import com.ruoyi.auction.service.IAuctionBidRecordService;
@@ -20,7 +22,14 @@
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
-import com.ruoyi.system.api.domain.*;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
+import com.ruoyi.system.api.domain.GoodsBrand;
+import com.ruoyi.system.api.domain.GoodsCategory;
+import com.ruoyi.system.api.domain.GoodsFlavorType;
+import com.ruoyi.system.api.domain.GoodsSeries;
+import com.ruoyi.system.api.domain.GoodsSku;
+import com.ruoyi.system.api.domain.Member;
+import com.ruoyi.system.api.domain.MemberAddress;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.feignClient.GoodsSkuClient;
import com.ruoyi.system.api.feignClient.MemberClient;
@@ -352,13 +361,15 @@
for (int i = 0; i <= auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
- AddOrder(auctionBidRecord.getTargetId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
+ AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
+ auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
} else {
for (int i = 0; i <= auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
- AddOrder(auctionBidRecord.getTargetId(),auctionBidRecord.getMemberId(),auctionBidRecord.getLastBidAmount(),auctionSalesroom.getBound());
+ AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
+ auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
}
}
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 40e972c..03b6425 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
@@ -20,6 +20,8 @@
import com.ruoyi.auction.controller.forepart.vo.ForepartAuctionSalesroomVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomInfoVO;
import com.ruoyi.auction.controller.forepart.vo.MemberAuctionSalesroomVO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomDTO;
+import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomGoodsDTO;
import com.ruoyi.auction.controller.management.dto.MgtAuctionSalesroomQuery;
import com.ruoyi.auction.controller.management.vo.MgtAuctionSalesroomVO;
import com.ruoyi.auction.domain.AuctionBidRecord;
@@ -37,9 +39,14 @@
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
+import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.IDhelper;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.page.BeanUtils;
+import com.ruoyi.common.core.utils.page.Checker;
+import com.ruoyi.common.core.utils.page.CollUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.AuctionGoods;
@@ -337,7 +344,7 @@
AuctionSalesroom byId = iAuctionSalesroomService.getById(memberAuctionSalesroomDTO.getAuctionSalesroomId());
MemberAuctionSalesroomInfoVO memberAuctionSalesroomInfoVO=new MemberAuctionSalesroomInfoVO();
memberAuctionSalesroomInfoVO.setId(byId.getId());
- memberAuctionSalesroomInfoVO.setBound(byId.getBound());
+ memberAuctionSalesroomInfoVO.setBound(byId.getBond());
memberAuctionSalesroomInfoVO.setAuthentication(byId.getAuthentication());
memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
memberAuctionSalesroomInfoVO.setSalesroomName(byId.getSalesroomName());
@@ -576,4 +583,60 @@
String auctionSalesroomNo = auctionSalesroom.getAuctionSalesroomNo();
return CreateQrCode.createQRCode(auctionSalesroomNo);
}
+
+ @Override
+ public void saveAuctionSalesroom(MgtAuctionSalesroomDTO dto) {
+ Long id = dto.getId();
+ AuctionSalesroom auctionSalesroom = BeanUtils.copyBean(dto, AuctionSalesroom.class);
+ List<MgtAuctionSalesroomGoodsDTO> auctionSalesroomGoodsDTOS = dto.getAuctionSalesroomGoodsDTOS();
+ CollUtils.check(auctionSalesroomGoodsDTOS, new Checker<MgtAuctionSalesroomGoodsDTO>() {
+ @Override
+ public void check(MgtAuctionSalesroomGoodsDTO data) {
+ if (StringUtils.isNull(data.getStartingPrice())) {
+ throw new ServiceException("拍卖商品起拍价格不能为空");
+ }
+ if (StringUtils.isNull(data.getMinimumMarkupAmount())) {
+ throw new ServiceException("拍卖商品最低加价金额不能为空");
+ }
+ if (StringUtils.isNull(data.getSalesroomStock())) {
+ throw new ServiceException("拍卖商品拍品数量不能为空");
+ }
+ if (StringUtils.isNull(data.getListingDuration())) {
+ throw new ServiceException("拍卖商品拍卖时间不能为空");
+ }
+ }
+ });
+ List<AuctionSalesroomGoods> auctionSalesroomGoods = BeanUtils.copyList(
+ auctionSalesroomGoodsDTOS, AuctionSalesroomGoods.class);
+
+ if (StringUtils.isNull(id)) {
+ // 生成唯一编号
+ Long nextId = IDhelper.getNextId();
+ auctionSalesroom.setAuctionSalesroomNo(nextId.toString());
+ // 添加
+ this.save(auctionSalesroom);
+ } else {
+ // 编辑
+ AuctionSalesroom auctionSalesroomOrg = this.getById(id);
+ if (StringUtils.isNull(auctionSalesroomOrg)) {
+ throw new ServiceException("该拍卖场不存在");
+ }
+ if (auctionSalesroomOrg.getStatus().equals(AuctionStartStatusEnum.IN_AUCTION)) {
+ throw new ServiceException("该拍卖场正在拍卖中，不能编辑");
+ }
+ if (auctionSalesroomOrg.getStatus().equals(AuctionStartStatusEnum.ENDED)) {
+ throw new ServiceException("该拍卖场已结束，不能编辑");
+ }
+ auctionSalesroom.setId(auctionSalesroomOrg.getId());
+ this.updateById(auctionSalesroom);
+ // 移除原来地拍卖商品
+ auctionSalesroomGoodsService.remove(Wrappers.<AuctionSalesroomGoods>lambdaQuery()
+ .eq(AuctionSalesroomGoods::getAuctionSalesroomId, id));
+ }
+ for (AuctionSalesroomGoods auctionSalesroomGood : auctionSalesroomGoods) {
+ auctionSalesroomGood.setAuctionSalesroomId(id);
+ }
+ // 添加拍卖商品
+ auctionSalesroomGoodsService.saveBatch(auctionSalesroomGoods);
+ }
}
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchase.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchase.java
index 66e10de..eb0e2c2 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchase.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/GoodsGroupPurchase.java
@@ -43,10 +43,6 @@
@TableField("goods_sku_id")
private Long goodsSkuId;
- @ApiModelProperty(value = "商品名称")
- @TableField("goods_sku_name")
- private String goodsSkuName;
-
@ApiModelProperty(value = "分享标题")
@TableField("share_title")
private String shareTitle;
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 7e6d355..d90f362 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
@@ -31,8 +31,8 @@
private static final long serialVersionUID = 1L;
- @TableId(value = "id", type = IdType.AUTO)
- private Integer id;
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
+ private Long id;
@ApiModelProperty(value = "收藏目标id")
private Long targetId;
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 6423dd4..ba23349 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
@@ -100,6 +100,12 @@
if (StringUtils.isNull(groupPurchase)) {
throw new ServiceException("团购商品不存在");
}
+ if (groupPurchase.getStartStatus().equals(StartStatusEnum.STARTED)) {
+ throw new ServiceException("已开始的团购商品不能编辑");
+ }
+ if (groupPurchase.getStartStatus().equals(StartStatusEnum.ENDED)) {
+ throw new ServiceException("已结束的团购商品不能编辑");
+ }
int originGroupStock = groupPurchase.getLimitNumber() * groupPurchase.getGroupSize();
GoodsSku goodsSku = goodsSkuService.getById(dto.getGoodsSkuId());
if (StringUtils.isNull(goodsSku)) {
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
index 55cf2c3..3b25190 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/OrderAuction.java
@@ -44,9 +44,6 @@
@ApiModelProperty(value = "拍卖商品id")
private Long salesroomGoodsId;
- @ApiModelProperty(value = "所属拍卖场")
- private String auctionSaleroomName;
-
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
index 34b6f9f..15434b5 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java
@@ -7,26 +7,23 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
import com.ruoyi.common.core.enums.BondStatusEnum;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.enums.AuctionOrderTypeEnum;
-import com.ruoyi.common.core.enums.BondStatusEnum;
import com.ruoyi.common.core.enums.PaymentMethodEnum;
-import com.ruoyi.order.util.OrderUtil;
-import com.ruoyi.system.api.domain.AuctionGoods;
-import com.ruoyi.system.api.domain.AuctionSalesroom;
-import com.ruoyi.system.api.domain.OrderAuctionBond;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.pojo.Paylog;
import com.ruoyi.order.mapper.OrderAuctionBondMapper;
import com.ruoyi.order.service.IOrderAuctionBondService;
import com.ruoyi.order.service.IPaylogService;
+import com.ruoyi.order.util.OrderUtil;
import com.ruoyi.order.util.SinataUtil;
+import com.ruoyi.system.api.domain.AuctionGoods;
+import com.ruoyi.system.api.domain.AuctionSalesroom;
import com.ruoyi.system.api.domain.OrderAuctionBond;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
-import java.util.List;
-import javax.annotation.Resource;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
+import java.util.List;
+import javax.annotation.Resource;
import org.apache.poi.ss.formula.functions.T;
import org.springframework.stereotype.Service;
@@ -122,12 +119,12 @@
PayInfoVO payInfoVO = new PayInfoVO();
if (memberAuctionSalesroomBondDTO.getBondType() == 2) {
AuctionSalesroom data = auctionClient.getauctionSalesroomOne(memberAuctionSalesroomBondDTO.getAuctionSalesroomId(), SecurityConstants.INNER).getData();
- if (data.getBound().intValue() == 0) {
+ if (data.getBond().intValue() == 0) {
OrderAuctionBond orderAuctionBond = new OrderAuctionBond();
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
- orderAuctionBond.setBond(data.getBound());
+ orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
iOrderAuctionBondService.save(orderAuctionBond);
@@ -141,7 +138,7 @@
orderAuctionBond.setOrderNo(OrderUtil.getOrderNoForPrefix("BO"));
orderAuctionBond.setAuctionSalesroomId(memberAuctionSalesroomBondDTO.getAuctionSalesroomId());
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
- orderAuctionBond.setBond(data.getBound());
+ orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY);
orderAuctionBond.setBondType(AuctionOrderTypeEnum.AUCTION_ITEMS);
if (memberAuctionSalesroomBondDTO.getPaymentMethod() == 1) {
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
index e34ae32..fc07965 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/domain/pojo/CouponMember.java
@@ -49,9 +49,6 @@
@ApiModelProperty(value = "优惠券状态-1删除0已过期1已领取2已使用")
private Integer couponStatus;
- @ApiModelProperty(value = "优惠券名称")
- private String couponName;
-
@ApiModelProperty(value = "满减金额，例如：满100元")
private BigDecimal fullReductionAmount;
--
Gitblit v1.7.1