github
/
jeecg-boot
mirror of https://github.com/jeecgboot/jeecg-boot
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

row locking when mabang job syncs orders and when invoicing

pull/8523/head
Gauthier LO 2025-05-16 18:16:20 +02:00
parent ef42e80004
commit 0807882656
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/mapper/xml/PlatformOrderContentMapper.xml
View File

@ -82,7 +82,7 @@
FROM platform_order_content FROM platform_order_content
WHERE erp_status <> 5 WHERE erp_status <> 5
AND platform_order_id IN <foreach collection="list" index="i" item="item" open="(" separator="," close=")">#{item}</foreach> AND platform_order_id IN <foreach collection="list" index="i" item="item" open="(" separator="," close=")">#{item}</foreach>
FOR UPDATE NOWAIT; FOR UPDATE;
</select> </select>
<select id="searchSkuDetail" <select id="searchSkuDetail"
@ -166,7 +166,7 @@
separator=","> separator=",">
#{erpStatus} #{erpStatus}
</foreach> </foreach>
FOR UPDATE NOWAIT; FOR UPDATE;
</select> </select>
<select id="findUninvoicedShippedOrderContents" resultType="org.jeecg.modules.business.entity.PlatformOrderContent"> <select id="findUninvoicedShippedOrderContents" resultType="org.jeecg.modules.business.entity.PlatformOrderContent">

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/PlatformOrderServiceImpl.java
View File

@ -275,7 +275,6 @@ public class PlatformOrderServiceImpl extends ServiceImpl<PlatformOrderMapper, P
return platformOrderMap.queryQuantities(client.getId()); return platformOrderMap.queryQuantities(client.getId());
} }
} }
// TODO update to FOR UPDATE
@Override @Override
public Map<PlatformOrder, List<PlatformOrderContent>> findUninvoicedOrders(List<String> shopIds, Date begin, Date end, List<String> warehouses) { 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); 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()))); return orderContents.stream().collect(groupingBy(platformOrderContent -> orderMap.get(platformOrderContent.getPlatformOrderId())));
} }
// TODO: maybe duplicate this for non invoicing usage !
@Override @Override
public Map<PlatformOrder, List<PlatformOrderContent>> fetchOrderData(List<String> orderIds) { public Map<PlatformOrder, List<PlatformOrderContent>> fetchOrderData(List<String> orderIds) {
List<PlatformOrder> orderList = platformOrderMap.selectBatchIds(orderIds); List<PlatformOrder> orderList = platformOrderMap.selectBatchIds(orderIds);