mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：订单撤回bug处理

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-14 11:07:05 +08:00
parent 7f39e3029f
commit 4ac353a83a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ExecutionTrackServiceImpl.java
View File

@ -275,14 +275,6 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
projectOrderInfoRecallService.insertProjectOrderInfoRecall(projectOrderInfoRecall); projectOrderInfoRecallService.insertProjectOrderInfoRecall(projectOrderInfoRecall);
//剔除流程 //剔除流程
todoService.deleteTodoByBusinessKey(projectOrderInfo.getOrderCode()); todoService.deleteTodoByBusinessKey(projectOrderInfo.getOrderCode());
//修改库存
InventoryOuter inventoryOuter = new InventoryOuter();
inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode());
List<InventoryOuter> inventoryOuters = outerService.selectInventoryOuterList(inventoryOuter);
if (CollUtil.isNotEmpty(inventoryOuters)) {
outerService.deleteInventoryOuterByIds(inventoryOuters.stream().map(item -> item.getId().toString()).collect(Collectors.joining(",")));
}
Map<String, Long> outerSumMap = inventoryOuters.stream().collect(Collectors.toMap(InventoryOuter::getProductCode, InventoryOuter::getQuantity, Long::sum));
//累计发货 //累计发货
List<InventoryDelivery> inventoryDeliveries = deliveryMapper.selectQuantityByOrderCodeStatus(projectOrderInfo.getOrderCode(), InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode()); List<InventoryDelivery> inventoryDeliveries = deliveryMapper.selectQuantityByOrderCodeStatus(projectOrderInfo.getOrderCode(), InventoryDelivery.DeliveryStatusEnum.CONFIRM_DELIVERY.getCode());
@ -295,6 +287,15 @@ public class ExecutionTrackServiceImpl implements IExecutionTrackService {
deliveryMapper.updateInventoryDelivery(updateDelivery); deliveryMapper.updateInventoryDelivery(updateDelivery);
} }
} }
//修改库存
InventoryOuter inventoryOuter = new InventoryOuter();
inventoryOuter.setOrderCode(projectOrderInfo.getOrderCode());
List<InventoryOuter> inventoryOuters = outerService.selectInventoryOuterList(inventoryOuter);
if (CollUtil.isNotEmpty(inventoryOuters)) {
outerService.deleteInventoryOuterByIds(inventoryOuters.stream().map(item -> item.getId().toString()).collect(Collectors.joining(",")));
}
Map<String, Long> outerSumMap = inventoryOuters.stream().collect(Collectors.toMap(InventoryOuter::getProductCode, InventoryOuter::getQuantity, Long::sum));
Map<String, Long> deliveryMap = inventoryDeliveries.stream().collect(Collectors.toMap(InventoryDelivery::getProductCode, InventoryDelivery::getQuantity, Long::sum)); Map<String, Long> deliveryMap = inventoryDeliveries.stream().collect(Collectors.toMap(InventoryDelivery::getProductCode, InventoryDelivery::getQuantity, Long::sum));
Map<String, ProductInfo> updateMap = new HashMap<>(); Map<String, ProductInfo> updateMap = new HashMap<>();
for (Map.Entry<String, Long> entry : outerSumMap.entrySet()) { for (Map.Entry<String, Long> entry : outerSumMap.entrySet()) {