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/AuctionSalesroomServiceImpl.java | 75 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 25 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 3da6fd8..bf73784 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
@@ -241,6 +241,10 @@
if (sysUser==null){
throw new ServiceException("手机号未注册");
}
+ if (sysUser.getStatus().equals(1)){
+ throw new ServiceException("该拍卖师账号停用");
+ }
+
if (!SecurityUtils.matchesPassword(arepartAuctionBidRecordDTO.getPassword(), sysUser.getPassword())){
throw new ServiceException("密码输入错误");
}
@@ -424,6 +428,7 @@
memberAuctionSalesroomInfoVO.setAuthentication(byId.getAuthentication());
memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
memberAuctionSalesroomInfoVO.setSalesroomName(byId.getSalesroomName());
+ memberAuctionSalesroomInfoVO.setEndTime(byId.getEndTime());
memberAuctionSalesroomInfoVO.setType(byId.getType());
memberAuctionSalesroomInfoVO.setDescription(byId.getDescription());
memberAuctionSalesroomInfoVO.setSharePic(byId.getSharePic());
@@ -454,7 +459,10 @@
forepartAuctionSalesroomGoodsVO.setStartingPrice(salesroomGoods.getStartingPrice());
forepartAuctionSalesroomGoodsVO.setSalesroomStock(salesroomGoods.getSalesroomStock());
forepartAuctionSalesroomGoodsVO.setGoodsSkustatus(salesroomGoods.getStatus().getCode());
+ forepartAuctionSalesroomGoodsVO.setMinimumMarkupAmount(salesroomGoods.getMinimumMarkupAmount());
+ forepartAuctionSalesroomGoodsVO.setStartTime(salesroomGoods.getStartTime());
forepartAuctionSalesroomGoodsVO.setYears(String.valueOf(goodsSku.getYears()));
+ forepartAuctionSalesroomGoodsVO.setListingDuration(salesroomGoods.getListingDuration());
forepartAuctionSalesroomGoodsVO.setSpec(goodsSku.getSpec());
forepartAuctionSalesroomGoodsVO.setSpecUnit(goodsSku.getSpecUnit());
LambdaQueryWrapper<AuctionBidRecord> wrapper1=Wrappers.lambdaQuery();
@@ -474,6 +482,28 @@
forepartAuctionSalesroomGoodsVO.setIsBond(1);
forepartAuctionSalesroomGoodsVO.setIsStatus(1);
}
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper2=Wrappers.lambdaQuery();
+ wrapper2.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
+ wrapper2.eq(AuctionBidRecord::getAuctionType,2);
+ wrapper2.eq(AuctionBidRecord::getTargetId,salesroomGoods.getId());
+ wrapper2.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list2 = auctionBidRecordMapper.selectOne(wrapper1);
+ if (list2!=null){
+ forepartAuctionSalesroomGoodsVO.setZgBid(list2.getLastBidAmount());
+ }
+
+ LambdaQueryWrapper<AuctionBidRecord> wrapper5=Wrappers.lambdaQuery();
+ wrapper5.eq(AuctionBidRecord::getAuctionSalesroomId,byId.getId());
+ wrapper5.eq(AuctionBidRecord::getAuctionType,2);
+ wrapper5.eq(AuctionBidRecord::getTargetId,salesroomGoods.getId());
+ wrapper5.eq(AuctionBidRecord::getMemberId,memberAuctionSalesroomDTO.getMemberId());
+ wrapper5.eq(AuctionBidRecord::getDelFlag,0);
+ AuctionBidRecord list5 = auctionBidRecordMapper.selectOne(wrapper1);
+ if (list5!=null){
+ forepartAuctionSalesroomGoodsVO.setPresentBid(list5.getLastBidAmount());
+ }
+
forepartAuctionSalesroomGoodsVOS.add(forepartAuctionSalesroomGoodsVO);
}
memberAuctionSalesroomInfoVO.setForepartAuctionSalesroomGoodsVO(forepartAuctionSalesroomGoodsVOS);
@@ -541,22 +571,15 @@
throw new ServiceException("当前拍卖场中标拍品订单未完成，请完成后再试。");
}
// 远程调用订单服务进行退款
- Map<String, Object> data = orderClient.refund(refundDTOList,
- SecurityConstants.INNER).getData();
+ orderClient.refund1(refundDTO, SecurityConstants.INNER).getData();
// 处理退款返回结果
List<String> successfulOrders = new ArrayList<>();
List<String> failedOrders = new ArrayList<>();
- data.forEach((key, value) -> {
- if ((boolean) value) {
- successfulOrders.add(key);
- } else {
- failedOrders.add(key);
- }
- });
- // 退款成功的订单修改状态
- List<Long> ids = new ArrayList<>();
+
+ List<Long> ids=new ArrayList<>();
ids.add(orderAuctionBond.getId());
+
// 远程调用订单服务修改订单状态
orderClient.updateOrderAuctionBondStatus(ids, BondStatusEnum.REFUNDED,SecurityConstants.INNER);
@@ -566,6 +589,7 @@
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderNo(orderAuctionBond.getOrderNo());
refundDTO.setAmount(orderAuctionBond.getBond());
+ refundDTOList.add(refundDTO);
LambdaQueryWrapper<AuctionBidRecord> wrapper = Wrappers.lambdaQuery();
wrapper.eq(AuctionBidRecord::getTargetId, memberAuctionSalesroomBondDTO.getAuctionGoodsId());
@@ -578,21 +602,11 @@
}
// 远程调用订单服务进行退款
- Map<String, Object> data = orderClient.refund(refundDTOList,
+ orderClient.refund1(refundDTO,
SecurityConstants.INNER).getData();
- // 处理退款返回结果
- List<String> successfulOrders = new ArrayList<>();
- List<String> failedOrders = new ArrayList<>();
- data.forEach((key, value) -> {
- if ((boolean) value) {
- successfulOrders.add(key);
- } else {
- failedOrders.add(key);
- }
- });
- // 退款成功的订单修改状态
- List<Long> ids = new ArrayList<>();
+
+ List<Long> ids=new ArrayList<>();
ids.add(orderAuctionBond.getId());
// 远程调用订单服务修改订单状态
orderClient.updateOrderAuctionBondStatus(ids,BondStatusEnum.REFUNDED,SecurityConstants.INNER);
@@ -651,7 +665,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);
@@ -729,6 +748,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);
--
Gitblit v1.7.1