diff --git a/src/main/java/com/xujie/modules/order/dao/PoOrderExtValueMapper.java b/src/main/java/com/xujie/modules/order/dao/PoOrderExtValueMapper.java index 6c67d9c..e61b8e5 100644 --- a/src/main/java/com/xujie/modules/order/dao/PoOrderExtValueMapper.java +++ b/src/main/java/com/xujie/modules/order/dao/PoOrderExtValueMapper.java @@ -12,5 +12,10 @@ public interface PoOrderExtValueMapper { @Param("itemNo") String itemNo, @Param("bizLevel") String bizLevel); + PoOrderExtValue selectByKeyNoLock(@Param("site") String site, + @Param("orderNo") String orderNo, + @Param("itemNo") String itemNo, + @Param("bizLevel") String bizLevel); + int upsert(PoOrderExtValue model); } diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 110d691..9b2e68c 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -487,7 +487,7 @@ public class PODetailServiceImpl extends ServiceImpl i IPage resultList = baseMapper.myPage(new Page(data.getPage(), data.getLimit()), data); if (resultList.getRecords() != null && !resultList.getRecords().isEmpty()) { - poOrderExtValueSupport.attachExtValues(site, resultList.getRecords()); + poOrderExtValueSupport.attachExtValuesForList(site, resultList.getRecords()); normalizeNumericDisplayForRows(resultList.getRecords()); } return new PageUtils(resultList); @@ -509,7 +509,7 @@ public class PODetailServiceImpl extends ServiceImpl i validatedConditions ); if (resultList.getRecords() != null && !resultList.getRecords().isEmpty()) { - poOrderExtValueSupport.attachExtValues(site, resultList.getRecords()); + poOrderExtValueSupport.attachExtValuesForList(site, resultList.getRecords()); normalizeNumericDisplayForRows(resultList.getRecords()); } return new PageUtils(resultList); diff --git a/src/main/java/com/xujie/modules/order/support/PoOrderExtValueSupport.java b/src/main/java/com/xujie/modules/order/support/PoOrderExtValueSupport.java index 76f66df..a4efb96 100644 --- a/src/main/java/com/xujie/modules/order/support/PoOrderExtValueSupport.java +++ b/src/main/java/com/xujie/modules/order/support/PoOrderExtValueSupport.java @@ -25,6 +25,14 @@ public class PoOrderExtValueSupport { private PoOrderExtValueMapper extValueMapper; public void attachExtValues(String site, List rows) { + attachExtValues(site, rows, false); + } + + public void attachExtValuesForList(String site, List rows) { + attachExtValues(site, rows, true); + } + + private void attachExtValues(String site, List rows, boolean noLock) { if (rows == null || rows.isEmpty()) { return; } @@ -32,8 +40,11 @@ public class PoOrderExtValueSupport { if (row == null || !StringUtils.hasText(row.getOrderNo()) || row.getItemNo() == null) { continue; } - PoOrderExtValue ext = extValueMapper.selectByKey( - site, row.getOrderNo(), String.valueOf(row.getItemNo()), "DETAIL"); + PoOrderExtValue ext = noLock + ? extValueMapper.selectByKeyNoLock( + site, row.getOrderNo(), String.valueOf(row.getItemNo()), "DETAIL") + : extValueMapper.selectByKey( + site, row.getOrderNo(), String.valueOf(row.getItemNo()), "DETAIL"); mergeToVo(ext, row); } } diff --git a/src/main/resources/mapper/order/PODetailMapper.xml b/src/main/resources/mapper/order/PODetailMapper.xml index 1f7863b..225c63d 100644 --- a/src/main/resources/mapper/order/PODetailMapper.xml +++ b/src/main/resources/mapper/order/PODetailMapper.xml @@ -7,7 +7,7 @@ COALESCE(NULLIF(LTRIM(RTRIM(statusMap.display_status)), ''), pod.status) - LEFT JOIN dbo.po_order_status_mapping statusMap + LEFT JOIN dbo.po_order_status_mapping statusMap WITH (NOLOCK) ON statusMap.source_status = pod.status AND statusMap.enabled = 'Y' @@ -311,6 +311,7 @@ order by id desc + - + + + MERGE INTO po_order_ext_value AS target USING (