From 5814d15a328979d3d97a65a8e6e3e70b5204ca32 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/service/impl/AuctionSalesroomServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 deletions(-)
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 23375b2..3a0ecae 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
@@ -53,6 +53,7 @@
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.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.constants.NotificationTypeConstant;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
@@ -240,9 +241,13 @@
if (sysUser==null){
throw new ServiceException("手机号未注册");
}
- /* if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){
+ if (sysUser.getStatus().equals(1)){
+ throw new ServiceException("该拍卖师账号停用");
+ }
+
+ if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){
throw new ServiceException("密码输入错误");
- }*/
+ }
LambdaQueryWrapper<AuctionSalesroom> wrapper=Wrappers.lambdaQuery();
wrapper.eq(AuctionSalesroom::getAuctionSalesroomNo,arepartAuctionBidRecordDTO.getAuctionSalesroomQrcode());
@@ -613,11 +618,27 @@
throw new ServiceException("出价不能比每次最少加价低");
}
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
+ wrapper3.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId());
+ wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId());
+ wrapper3.eq(AuctionBidRecord::getDelFlag,0);
+ wrapper3.orderByDesc(AuctionBidRecord::getLastBidAmount);
+ wrapper3.last("limit 1");
+ AuctionBidRecord one3 = auctionBidRecordService.getOne(wrapper3);
+ if (one3!=null){
+ if (bidVO.getLastBidAmount().doubleValue()<one3.getLastBidAmount().doubleValue()){
+ throw new ServiceException("出价不能比当前最高价低");
+ }
+ }
+
+
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
wrapper1.eq(AuctionBidRecord::getMemberId,bidVO.getMemberId());
wrapper1.eq(AuctionBidRecord::getAuctionSalesroomId,bidVO.getAuctionSalesroomId());
wrapper1.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId());
wrapper1.eq(AuctionBidRecord::getDelFlag,0);
+
AuctionBidRecord one = auctionBidRecordService.getOne(wrapper1);
if (one!=null){
BigDecimal bigDecimal1=one.getLastBidAmount().add(byId.getMinimumMarkupAmount());
@@ -634,7 +655,12 @@
one.setTargetId(bidVO.getTargetId());
one.setMemberId(bidVO.getMemberId());
one.setLastBidTime(LocalDateTime.now());
- one.setNickname(membeOne.getNickname());
+ if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ one.setNickname(membeOne.getRealName());
+ }else{
+ one.setNickname(membeOne.getNickname());
+ }
+
one.setPhone(membeOne.getPhone());
one.setAuctionType(AuctionOrderTypeEnum.AUCTION_ITEMS);
one.setStatus(BidStatusEnum.ELIMINATE);
@@ -694,6 +720,7 @@
}
}
+
LambdaQueryWrapper<AuctionBidRecord> wrapper3=Wrappers.lambdaQuery();
wrapper3.eq(AuctionBidRecord::getTargetId,bidVO.getTargetId());
wrapper3.eq(AuctionBidRecord::getDelFlag,0);
@@ -711,6 +738,12 @@
one3.setAuctionSalesroomId(bidVO.getAuctionSalesroomId());
one3.setTargetId(bidVO.getTargetId());
one3.setMemberId(bidVO.getMemberId());
+ if(membeOne.getRealName()!=null||membeOne.getRealName()!=""){
+ one3.setNickname(membeOne.getRealName());
+ }else{
+ one3.setNickname(membeOne.getNickname());
+ }
+ one3.setPhone(membeOne.getPhone());
one3.setLastBidTime(LocalDateTime.now());
one3.setAuctionType(AuctionOrderTypeEnum.REGULAR_ITEMS);
one3.setStatus(BidStatusEnum.ELIMINATE);
@@ -1139,7 +1172,9 @@
vo.setAuctionSalesroomGoodsVOS(collect);
if (StringUtils.isNotNull(vo.getCurrentAuctionSalesroomGoods())) {
int index = collect.indexOf(vo.getCurrentAuctionSalesroomGoods());
- vo.setNextAuctionSalesroomGoods(collect.get(index + 1));
+ if (collect.size() > 1) {
+ vo.setNextAuctionSalesroomGoods(collect.get(index + 1));
+ }
// 分页查询当前拍品出价信息
List<AuctionBidRecord> list = auctionBidRecordService.lambdaQuery()
.eq(AuctionBidRecord::getTargetId,
--
Gitblit v1.7.1