From 8766726189e19ccdc03d4b93c1105034bf4f8c2c Mon Sep 17 00:00:00 2001
From: cb <275647614@qq.com>
Date: Thu, 5 Jun 2025 14:43:49 +0800
Subject: [PATCH] no message

---
 .../order/OrderDetailController.java          | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
index c00cc709..9390b22c 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderDetailController.java
@@ -55,6 +55,9 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
@@ -758,18 +761,13 @@ public class OrderDetailController extends BaseController {
                 orderListResponse.setIsOnlyServ(Boolean.FALSE);
             }
 
-            // 售后记录
-//            AfterServiceRecord afterServiceRecord = new AfterServiceRecord();
-//            afterServiceRecord.setOrderDetailId(detail.getId());
-//            List<AfterServiceRecord> afterServiceRecordList  =afterServiceRecordService.selectAfterServiceRecordList(afterServiceRecord);
 
             // 编辑返回属性
-            orderListResponse.setGoodsBrand(orderMaster.getGoodsBrand());
-            orderListResponse.setGoodsSpecification(orderMaster.getGoodsSpecification());
             orderListResponse.setOrderDetailId(detail.getId());
             orderListResponse.setOrderDetailCode(detail.getCode());
             orderListResponse.setOrderMasterId(detail.getOrderMasterId());
             orderListResponse.setOrderMasterCode(detail.getOrderMasterCode());
+            orderListResponse.setGoods(goods);
             orderListResponse.setGoodsName(goods.getGoodsName());
             orderListResponse.setGoodsLogoUrl(goods.getGoodsImgUrl());
             orderListResponse.setDiscountMoney(financialDetail.getDiscountMoney());
@@ -1310,20 +1308,27 @@ public class OrderDetailController extends BaseController {
                 orderAttachmentRecord.setFinancialChangeRecordId(fcr.getId());
                 List<OrderAttachmentRecord> orderAttachmentRecords = orderAttachmentRecordService.selectOrderAttachmentRecordList(orderAttachmentRecord);
                 
-                for (OrderAttachmentRecord orderAttachmentRecord1 : orderAttachmentRecords) {
-                    executor.execute(() -> {
-                        try {
-                            JSONObject response = adapayService.payReverse(om.getDeptId(), orderAttachmentRecord1.getPaymentId(), 
-                                String.valueOf(orderAttachmentRecord1.getAttachMoney()), RefundType.RCG);
-                            logger.info("配件退款成功: paymentId={}, amount={}，response{}", orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(),response);
-                        } catch (BaseAdaPayException e) {
-                            logger.error("配件退款失败: paymentId={}, amount={}, error={}", 
-                                orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(), e.getMessage(), e);
-                        }
-                    });
-                }
+                // 创建一个定时任务，延迟1分钟后执行退款操作
+                ScheduledExecutorService scheduledExecutor = Executors.newScheduledThreadPool(1);
+                scheduledExecutor.schedule(() -> {
+                    for (OrderAttachmentRecord orderAttachmentRecord1 : orderAttachmentRecords) {
+                        executor.execute(() -> {
+                            try {
+                                JSONObject response = adapayService.payReverse(om.getDeptId(), orderAttachmentRecord1.getPaymentId(), 
+                                    String.valueOf(orderAttachmentRecord1.getAttachMoney()), RefundType.RCG);
+                                logger.info("配件退款成功: paymentId={}, amount={}，response{}", orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(),response);
+                            } catch (BaseAdaPayException e) {
+                                logger.error("配件退款失败: paymentId={}, amount={}, error={}", 
+                                    orderAttachmentRecord1.getPaymentId(), orderAttachmentRecord1.getAttachMoney(), e.getMessage(), e);
+                            }
+                        });
+                    }
+                    // 关闭定时器
+                    scheduledExecutor.shutdown();
+                }, 1, TimeUnit.MINUTES);
             }
         }
+        orderAttachmentRecordService.deleteOrderAttachmentRecordByOrderDetailId(orderDetail.getId());
         // 退回旧商品
 //        List<OrderGoods> goodsList = orderGoodsService.selectByOrderDetailId(orderDetail.getId());
 //        goodsList.forEach(orderGoods -> {