From 080788265644056e26ab722c28c5cbb9352d6295 Mon Sep 17 00:00:00 2001
From: Gauthier LO <lo.gauthier.glo@gmail.com>
Date: Fri, 16 May 2025 18:16:20 +0200
Subject: [PATCH] row locking when mabang job syncs orders and when invoicing

---
 .../business/mapper/xml/PlatformOrderContentMapper.xml        | 4 ++--
 .../business/service/impl/PlatformOrderServiceImpl.java       | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
index 2953afe64..969f1497b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
@@ -82,7 +82,7 @@
         FROM platform_order_content
         WHERE erp_status &lt;&gt; 5
         AND platform_order_id IN <foreach collection="list" index="i" item="item" open="(" separator="," close=")">#{item}</foreach>
-        FOR UPDATE NOWAIT;
+        FOR UPDATE;
     </select>
 
     <select id="searchSkuDetail"
@@ -166,7 +166,7 @@
                 separator=",">
             #{erpStatus}
         </foreach>
-        FOR UPDATE NOWAIT;
+        FOR UPDATE;
     </select>
 
     <select id="findUninvoicedShippedOrderContents" resultType="org.jeecg.modules.business.entity.PlatformOrderContent">
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
index 2826f204f..dae656990 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
@@ -275,7 +275,6 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
             return platformOrderMap.queryQuantities(client.getId());
         }
     }
-    // TODO update to FOR UPDATE
     @Override
     public Map<PlatformOrder, List<PlatformOrderContent>> findUninvoicedOrders(List<String> shopIds, Date begin, Date end, List<String> warehouses) {
         List<PlatformOrder> orderList = platformOrderMap.findUninvoicedOrders(shopIds, begin, end, warehouses);
@@ -306,7 +305,6 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
         return orderContents.stream().collect(groupingBy(platformOrderContent -> orderMap.get(platformOrderContent.getPlatformOrderId())));
     }
 
-    // TODO: maybe duplicate this for non invoicing usage !
     @Override
     public Map<PlatformOrder, List<PlatformOrderContent>> fetchOrderData(List<String> orderIds) {
         List<PlatformOrder> orderList = platformOrderMap.selectBatchIds(orderIds);