From 31267d9b3a33c8b3fbb1b9f810ab08e01c49b846 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 19:12:28 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomGoodsServiceImpl.java | 56 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 13 deletions(-)
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 afc8688..f68a7fc 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
@@ -21,6 +21,7 @@
import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
import com.ruoyi.common.core.enums.BidStatusEnum;
import com.ruoyi.common.core.enums.OrderFromEnum;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.*;
@@ -35,6 +36,7 @@
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -105,7 +107,7 @@
wrapper1.eq(AuctionSalesroomGoods::getStatus,2);
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
- wrapper1.orderByAsc(AuctionSalesroomGoods::getSortNum);
+ wrapper1.orderByDesc(AuctionSalesroomGoods::getSortNum);
wrapper1.last("limit 1");
auctionSalesroomGoods = this.getOne(wrapper1);
if (auctionSalesroomGoods==null){
@@ -122,7 +124,7 @@
.getData();
forepartAuctionSalesroomGoodsVO.setGoodsSkuId(auctionSalesroomGoods.getId());
forepartAuctionSalesroomGoodsVO.setGoodsSkuName(goodsSku.getSkuName());
- forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus());
+ forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
forepartAuctionSalesroomGoodsVO.setStartingPrice(auctionSalesroomGoods.getStartingPrice());
forepartAuctionSalesroomGoodsVO.setSalesroomStock(auctionSalesroomGoods.getSalesroomStock());
forepartAuctionSalesroomGoodsVO.setListingDuration(auctionSalesroomGoods.getListingDuration());
@@ -174,6 +176,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroomGoods::getStatus,0);
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
+ wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.orderByAsc(AuctionSalesroomGoods::getSortNum);
List<AuctionSalesroomGoods> auctionSalesroomGoods = this.list(wrapper);
@@ -191,6 +194,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroomGoods::getStatus,1);
wrapper.eq(AuctionSalesroomGoods::getDelFlag,0);
+ wrapper.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrapper.last("limit 1");
AuctionSalesroomGoods auctionSalesroomGoods = this.getOne(wrapper);
@@ -203,7 +207,7 @@
currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods.getId());
currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoods.getStartTime());
- currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods.getStatus().getCode());
currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoods.getListingDuration());
auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
list.add(auctionSalesroomGoods.getSortNum());
@@ -211,6 +215,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper1.eq(AuctionSalesroomGoods::getStatus,0);
+ wrapper1.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrapper1.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
if (auctionSalesroomGoods!=null) {
wrapper1.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoods.getSortNum() + 1);
@@ -219,6 +224,7 @@
LambdaQueryWrapper<AuctionSalesroomGoods> wrappers=Wrappers.lambdaQuery();
wrappers.eq(AuctionSalesroomGoods::getStatus,0);
wrappers.eq(AuctionSalesroomGoods::getDelFlag,0);
+ wrappers.eq(AuctionSalesroomGoods::getBackupStatus,false);
wrappers.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
wrappers.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrappers.last("limit 1");
@@ -231,7 +237,7 @@
currentAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoodss.getId());
currentAuctionSalesroomGoods.setCoverPic(goodsSku.getCoverPic());
currentAuctionSalesroomGoods.setStartTime(auctionSalesroomGoodss.getStartTime());
- currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus());
+ currentAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoodss.getStatus().getCode());
currentAuctionSalesroomGoods.setListingDuration(auctionSalesroomGoodss.getListingDuration());
auctionSalesroomVO.setCurrentAuctionSalesroomGoods(currentAuctionSalesroomGoods);
wrappers.eq(AuctionSalesroomGoods::getSortNum, auctionSalesroomGoodss.getSortNum());
@@ -250,7 +256,7 @@
GoodsSku goodsSku1=goodsSkuOne1.getData();
nextAuctionSalesroomGoods.setNextGoodsSkuName(goodsSku1.getSkuName());
nextAuctionSalesroomGoods.setCoverPic(goodsSku1.getCoverPic());
- nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus());
+ nextAuctionSalesroomGoods.setGoodsSkustatus(auctionSalesroomGoods1.getStatus().getCode());
nextAuctionSalesroomGoods.setGoodsSkuId(auctionSalesroomGoods1.getId());
auctionSalesroomVO.setNextAuctionSalesroomGoods(nextAuctionSalesroomGoods);
}
@@ -259,8 +265,9 @@
wrapper2.notIn(AuctionSalesroomGoods::getSortNum,list);
}
wrapper2.eq(AuctionSalesroomGoods::getAuctionSalesroomId,ationSalesroomGoodsDTO.getAuctionSalesroomId());
- wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
wrapper2.orderByAsc(AuctionSalesroomGoods::getStatus);
+ wrapper2.orderByAsc(AuctionSalesroomGoods::getSortNum);
+ wrapper2.eq(AuctionSalesroomGoods::getBackupStatus,false);
List<AuctionSalesroomGoods> auctionSalesroomGoods2 = this.list(wrapper2);
for (AuctionSalesroomGoods salesroomGoods:auctionSalesroomGoods2){
ForepartAuctionSalesroomGoodsVO forepartAuctionSalesroomGoodsVO1=new ForepartAuctionSalesroomGoodsVO();
@@ -270,7 +277,7 @@
forepartAuctionSalesroomGoodsVO1.setGoodsSkuName(goodsSku2.getSkuName());
forepartAuctionSalesroomGoodsVO1.setCoverPic(goodsSku2.getCoverPic());
forepartAuctionSalesroomGoodsVO1.setGoodsSkuId(salesroomGoods.getId());
- forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus());
+ forepartAuctionSalesroomGoodsVO1.setGoodsSkustatus(salesroomGoods.getStatus().getCode());
auctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO1);
}
@@ -297,9 +304,15 @@
public void auctionSalesroomStart(AuctionSalesroomDTO ationSalesroomGoodsDTO) {
AuctionSalesroom auctionSalesroom = auctionSalesroomMapper.selectById(
ationSalesroomGoodsDTO.getAuctionSalesroomId());
+
+ if (auctionSalesroom.getStatus().getCode()==1){
+ throw new ServiceException("拍卖会已开始，请勿点击");
+ }
+
auctionSalesroom.setStatus(AuctionStartStatusEnum.IN_AUCTION);
auctionSalesroom.setStartTime(LocalDateTime.now());
auctionSalesroomMapper.updateById(auctionSalesroom);
+
LambdaQueryWrapper<AuctionSalesroomGoods> wrapper2=Wrappers.lambdaQuery();
wrapper2.eq(AuctionSalesroomGoods::getStatus,0);
@@ -418,8 +431,14 @@
wrapper2.eq(AuctionSalesroomGoods::getDelFlag,0);
wrapper2.eq(AuctionSalesroomGoods::getId,auctionSalesroomGoodsDTO.getGoodsSkuId());
AuctionSalesroomGoods auctionSalesroomGoods=this.getOne(wrapper2);
+ if (auctionSalesroomGoods==null){
+ throw new ServiceException("拍卖会已没有待开始拍卖商品");
+ }
auctionSalesroomGoods.setStatus(AuctionGoodsStatusEnum.IN_PROGRESS);
auctionSalesroomGoods.setStartTime(LocalDateTime.now());
+ if (auctionSalesroomGoods.getBackupStatus()){
+ auctionSalesroomGoods.setBackupStatus(false);
+ }
this.updateById(auctionSalesroomGoods);
Map<String, Object> map = new ConcurrentHashMap<>();
@@ -469,6 +488,7 @@
for (int i = 0; i < auctionSalesroomGoods.getSalesroomStock(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
@@ -483,6 +503,7 @@
for (int i = 0; i < auctionBidRecordList.size(); i++) {
AuctionBidRecord auctionBidRecord = auctionBidRecordList.get(i);
auctionBidRecord.setStatus(BidStatusEnum.SUCCESSFUL);
+ auctionBidRecordMapper.updateById(auctionBidRecord);
AddOrder(auctionBidRecord.getTargetId(), auctionBidRecord.getMemberId(),
auctionBidRecord.getLastBidAmount(), auctionSalesroom.getBond());
}
@@ -591,7 +612,9 @@
wrapper2.eq(AuctionBidRecord::getAuctionType,2);
wrapper2.eq(AuctionBidRecord::getTargetId,byId1.getId());
wrapper2.eq(AuctionBidRecord::getDelFlag,0);
- AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1);
+ wrapper2.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ wrapper2.last("limit 1");
+ AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper2);
if (list2!=null){
AuctionSalesroomGoodsInfoVO.setZgBid(list2.getLastBidAmount());
}
@@ -625,7 +648,7 @@
auctionBidRecordVO.setLastBidAmount(auctionBidRecordList.get(i).getLastBidAmount());
auctionBidRecordVO.setLastBidTime(auctionBidRecordList.get(i).getLastBidTime());
auctionBidRecordVO.setMemberName(auctionBidRecordList.get(i).getNickname());
- auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getId());
+ auctionBidRecordVO.setMemberId(auctionBidRecordList.get(i).getMemberId());
auctionBidRecordVOList.add(auctionBidRecordVO);
}
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -676,12 +699,19 @@
SecurityConstants.INNER);
MemberAddress memberAddress=memberAddressR.getData();
-
CustomConfig memberPointsMoney = sysUserClient.getconfig("MEMBER_POINTS_MONEY").getData();
CustomConfig memberPointsPoints = sysUserClient.getconfig("MEMBER_POINTS_POINTS").getData();
- Double aDouble= Double.valueOf(memberPointsMoney.getConfigValue()) * Double.valueOf(memberPointsPoints.getConfigValue());
- BigDecimal pi=lastBidAmount.multiply(new BigDecimal(aDouble));
- order.setPoints(pi.intValue());
+
+ if (lastBidAmount.intValue()>0){
+ BigDecimal divide = lastBidAmount.divide(new BigDecimal(memberPointsMoney.getConfigValue()));
+ BigDecimal roundedDown = divide.setScale(0, RoundingMode.DOWN);
+ BigDecimal aDouble= roundedDown.multiply(new BigDecimal(memberPointsPoints.getConfigValue()));
+ order.setPoints(aDouble.intValue());
+ }else{
+ order.setPoints(0);
+ }
+
+
if (memberAddress!=null){
order.setReceiverCity(memberAddress.getCity());
order.setReceiverDetailAddress(memberAddress.getDetailedAddress());
--
Gitblit v1.7.1