Przeglądaj źródła

订单导出优化中断操作

zhangxin 4 dni temu
rodzic
commit
b22d67d487

+ 6 - 5
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1499,12 +1499,13 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
         for (int i = 0; i < totalRows; i += batchSize) {
             int end = Math.min(i + batchSize, totalRows);
             List<OrderRefundVo> batch = orderList.subList(i, end);
-            // 定期检查中断标志
-            if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
-                context.setProcessedRows(indexNum);
-                break;
-            }
+
             for (OrderRefundVo orderRefundVo : orderList) {
+                // 定期检查中断标志
+                if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
+                    context.setProcessedRows(indexNum);
+                    break;
+                }
                 Row row = sheet.createRow(rowNum++);
                 row.setHeightInPoints(18);
                 // 序号

+ 0 - 6
yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -1579,12 +1579,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             for (int i = 0; i < totalRows; i += batchSize) {
                 int end = Math.min(i + batchSize, totalRows);
                 List<Order> batch = orderList.subList(i, end);
-                // 定期检查中断标志
-                if (context.isCancelled() || Thread.currentThread().isInterrupted()) {
-                    context.setProcessedRows(indexNum);
-                    break;
-//                    throw new InterruptedException("导出被中断");
-                }
                 for (Order order : batch) {
                     // 定期检查中断标志
                     if (context.isCancelled() || Thread.currentThread().isInterrupted()) {