From af16f5e13c9c56f1f90be8acee340bc3b1485004 Mon Sep 17 00:00:00 2001
From: Damonny <826010988@qq.com>
Date: Tue, 25 Feb 2025 17:55:50 +0800
Subject: [PATCH] =?UTF-8?q?update:=E8=AE=A2=E5=8D=95=E8=A7=A3=E5=AF=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/context/TenantContextHolder.java     |  4 ++--
 .../DouDianOrderCatchServiceImpl.java         | 23 ++++++++-----------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
index 701eb49185..7b9053fbde 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
@@ -26,8 +26,8 @@ public class TenantContextHolder {
      * @return 租户编号
      */
     public static Long getTenantId() {
-        return TENANT_ID.get();
-        // return 162L;
+//        return TENANT_ID.get();
+         return 162L;
     }
 
     /**
diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
index 68863f55dc..fdf7d64156 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/orderCatch/DouDianOrderCatchServiceImpl.java
@@ -220,7 +220,6 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
         //            String idCardName = userIdInfo.getIdCardName();
         String encryptIdCardName = userIdInfo.getEncryptIdCardName();
         List<OrdersDO> orderList = new ArrayList<>();
-        List<OrdersDO> orderListAll = new ArrayList<>();
         for (com.doudian.open.api.order_orderDetail.data.SkuOrderListItem skuOrderListItem : skuOrderList) {
             String orderId = skuOrderListItem.getOrderId();
             OrdersDO ordersDO = new OrdersDO();
@@ -333,17 +332,17 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
 
             }
         }
-        orderListAll.addAll(orderList);
+        // 执行解密，解密后更新数据库
+        for (List<OrdersDO> ordersDOS : GroupListUtil.groupList(orderList, 50)) {
+            batchDecryptOrderAndUpdate(ordersDOS);
+        }
         for (OrdersDO ordersDO : orderList) {
             OrdersSaveReqVO ordersSaveReqVO = new OrdersSaveReqVO();
             BeanUtils.copyProperties(ordersDO,ordersSaveReqVO);
             ordersService.createOrders(ordersSaveReqVO);
         }
 //        ordersMapper.insertBatch(orderList);
-        // 执行解密，解密后更新数据库
-        for (List<OrdersDO> ordersDOS : GroupListUtil.groupList(orderListAll, 50)) {
-            batchDecryptOrderAndUpdate(ordersDOS);
-        }
+
     }
 
 
@@ -360,7 +359,6 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
         // 所有在售商品sku
         List<String> skuList = onSaleProductDOS.stream().map(OnSaleProductDO::getSku).toList();
         //数据分片处理  分片理由 每次最多徐解密50条数据，一条订单解密5个数据，10个订单解密50条
-        List<OrdersDO> orderListAll = new ArrayList<>();
         List<List<ShopOrderListItem>> orderGroupList = GroupListUtil.groupList(orders, 10);
 //        orderGroupList 的 size 最大为10
         for (List<ShopOrderListItem> orderListItems : orderGroupList) {
@@ -514,7 +512,10 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
                     }
                 }
             }
-            orderListAll.addAll(orderList);
+            // 执行解密，解密后更新数据库
+            for (List<OrdersDO> ordersDOS : GroupListUtil.groupList(orderList, 50)) {
+                batchDecryptOrderAndUpdate(ordersDOS);
+            }
             //调用创建订单流程，触发发送短信
             for (OrdersDO ordersDO : orderList) {
                 OrdersSaveReqVO ordersSaveReqVO = new OrdersSaveReqVO();
@@ -523,10 +524,6 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
             }
 //            ordersMapper.insertBatch(orderList);
         }
-        // 执行解密，解密后更新数据库
-        for (List<OrdersDO> ordersDOS : GroupListUtil.groupList(orderListAll, 50)) {
-            batchDecryptOrderAndUpdate(ordersDOS);
-        }
     }
     private CipherInfosItem createCipherItem(String cipherText, String authId) {
         CipherInfosItem item = new CipherInfosItem();
@@ -572,7 +569,7 @@ public class DouDianOrderCatchServiceImpl implements OrderCatchService {
                 }
             }
         }
-        ordersMapper.updateBatch(orderList);
+//        ordersMapper.updateBatch(orderList);
     }
 
     /**