From 2a97ecf8833f24dfbd5bf251e1fc1bdb632bbefb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:22 +0800
Subject: [PATCH] 修改bug
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderAuctionBondServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
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 4459cd1..34bc269 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
@@ -19,18 +19,16 @@
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.BondReturnDTO;
import com.ruoyi.system.api.domain.dto.MemberAuctionSalesroomBondDTO;
import com.ruoyi.system.api.domain.dto.OrderAuctionBondDTO;
import com.ruoyi.system.api.domain.dto.RefundDTO;
import com.ruoyi.system.api.domain.vo.PayInfoVO;
import com.ruoyi.system.api.feignClient.AuctionClient;
-
-import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -101,8 +99,9 @@
return R.fail("微信退款失败！");
}
}
-
+ orderAuctionBond.setBoundStatus(BondStatusEnum.REFUNDED);
}
+ this.updateBatchById(orderAuctionBondList);
return R.ok();
}
@@ -156,7 +155,7 @@
orderAuctionBond.setMemberId(memberAuctionSalesroomBondDTO.getMemberId());
orderAuctionBond.setBond(data.getBond());
orderAuctionBond.setBoundStatus(BondStatusEnum.PAID);
- orderAuctionBond.setBoundStatus(BondStatusEnum.TO_PLAY);
+ orderAuctionBond.setBondType(AuctionOrderTypeEnum.REGULAR_ITEMS);
this.save(orderAuctionBond);
payInfoVO.setOrderNO(orderAuctionBond.getOrderNo());
payInfoVO.setType(0);
@@ -236,12 +235,13 @@
@Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
- public void returnBondByAuctionGoodsId(Long id) {
+ public void returnBondByAuctionGoodsId(BondReturnDTO bondReturnDTO) {
+ Long id = bondReturnDTO.getId();
List<OrderAuctionBond> list = this.lambdaQuery().eq(OrderAuctionBond::getAuctionGoodsId, id)
.eq(OrderAuctionBond::getBoundStatus, BondStatusEnum.PAID).list();
- Set<String> orderNoSet = list.stream().map(OrderAuctionBond::getOrderNo)
- .collect(Collectors.toSet());
- List<RefundDTO> refundDTOList = list.stream().map(item -> {
+ List<Long> memberIdList = bondReturnDTO.getMemberIdList();
+ List<RefundDTO> refundDTOList = list.stream()
+ .filter(r -> !memberIdList.contains(r.getMemberId())).map(item -> {
RefundDTO refundDTO = new RefundDTO();
refundDTO.setAmount(item.getBond());
refundDTO.setOrderNo(item.getOrderNo());
--
Gitblit v1.7.1