From d7ba3068f424e44119ea44d8b7b0758690cc2f55 Mon Sep 17 00:00:00 2001 From: Tankaikai Date: Mon, 10 Mar 2025 11:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E5=8F=91?= =?UTF-8?q?=E7=94=9Fmq=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/service/impl/PayServiceImpl.java | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java index 643bcb2dc..d6767be0b 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java @@ -1,6 +1,7 @@ package com.czg.service.order.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.convert.Convert; import cn.hutool.core.exceptions.ValidateException; import cn.hutool.core.util.IdUtil; import com.alibaba.fastjson2.JSONObject; @@ -52,9 +53,6 @@ import java.time.LocalDateTime; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.Executor; -import java.util.concurrent.TimeUnit; /** * @author ww @@ -489,7 +487,7 @@ public class PayServiceImpl implements PayService { @Transactional public CzgResult refundOrderBefore(OrderInfoRefundDTO param) { OrderInfo orderInfo = orderInfoService.getById(param.getOrderId()); - Map returnProMap = new HashMap<>(); + Map returnProMap = new HashMap<>(); boolean isPay = true; String refPayOrderNo = "REFO" + IdUtil.getSnowflakeNextId(); if (orderInfo.getStatus().equals(OrderStatusEnums.UNPAID.getCode())) { @@ -527,7 +525,7 @@ public class PayServiceImpl implements PayService { orderDetail.setRefundRemark(orderDetail.getRefundRemark() + param.getRefundReason()); orderDetail.setReturnAmount(refundDetail.getReturnAmount()); orderDetailService.updateById(orderDetail); - returnProMap.put(orderDetail.getProductId(), refundDetail.getNum()); + returnProMap.put(Convert.toStr(orderDetail.getProductId()), refundDetail.getNum()); } long count = orderDetailService.queryChain() .eq(OrderDetail::getOrderId, orderInfo.getId()) @@ -545,11 +543,11 @@ public class PayServiceImpl implements PayService { .list(); for (OrderDetail orderDetail : orderDetails) { if (isPay) { - returnProMap.put(orderDetail.getProductId(), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())); + returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum()).subtract(orderDetail.getRefundNum())); orderDetail.setRefundNum(orderDetail.getNum().subtract(orderDetail.getReturnNum())); orderDetail.setStatus(OrderStatusEnums.REFUND.getCode()); } else { - returnProMap.put(orderDetail.getProductId(), orderDetail.getNum().subtract(orderDetail.getReturnNum())); + returnProMap.put(Convert.toStr(orderDetail.getProductId()), orderDetail.getNum().subtract(orderDetail.getReturnNum())); orderDetail.setReturnNum(orderDetail.getNum()); orderDetail.setStatus(OrderStatusEnums.CANCELLED.getCode()); }