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 | 32 ++++++++------------------------ 1 files changed, 8 insertions(+), 24 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 d1b9ddf..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 @@ -571,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); @@ -596,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()); @@ -608,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); -- Gitblit v1.7.1