Commit 59f6e1a9 by 王志超

feat: 组装主工单商品信息

parent 37b687d3
Pipeline #86390 passed with stages
in 1 minute 45 seconds
...@@ -1090,8 +1090,11 @@ public class ChangeFlowBiz { ...@@ -1090,8 +1090,11 @@ public class ChangeFlowBiz {
private void buildItemBasicInfoList(ChangeRecord changeRecord, ChangeFlowVO changeFlowVO) { private void buildItemBasicInfoList(ChangeRecord changeRecord, ChangeFlowVO changeFlowVO) {
String itemJsonStr = changeRecord.getChangeItem(); String itemJsonStr = changeRecord.getChangeItem();
if (StringUtils.isBlank(itemJsonStr)) { if (StringUtils.isBlank(itemJsonStr)) {
changeFlowVO.setChangeItems(null);
changeFlowVO.setItemBasicInfoList(null); changeFlowVO.setItemBasicInfoList(null);
} else { return;
}
String changeSkuJson = changeRecord.getChangeSku(); String changeSkuJson = changeRecord.getChangeSku();
List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class); List<ItemVO> itemList = JSON.parseArray(itemJsonStr, ItemVO.class);
List<ItemSkuVO> itemSkuVOS = new ArrayList<>(); List<ItemSkuVO> itemSkuVOS = new ArrayList<>();
...@@ -1106,11 +1109,6 @@ public class ChangeFlowBiz { ...@@ -1106,11 +1109,6 @@ public class ChangeFlowBiz {
} }
}); });
changeFlowVO.setChangeItems(itemList); changeFlowVO.setChangeItems(itemList);
// 变更执行/结果确认/完结节点,展示变更商品基础信息
String flowNode = changeRecord.getFlowNode();
if (ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId().equals(flowNode)
|| ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId().equals(flowNode)
|| ChangeFlowEnum.END.getNodeId().equals(flowNode)) {
List<Long> itemIds = itemList.stream().map(ItemVO::getItemId).collect(Collectors.toList()); List<Long> itemIds = itemList.stream().map(ItemVO::getItemId).collect(Collectors.toList());
// 批量查询spu信息 // 批量查询spu信息
List<SpuTO> spuTOS = itemService.batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds) List<SpuTO> spuTOS = itemService.batchQuerySpuInfo(BatchQuerySpuInfoParam.builder().ids(itemIds)
...@@ -1176,8 +1174,6 @@ public class ChangeFlowBiz { ...@@ -1176,8 +1174,6 @@ public class ChangeFlowBiz {
}).collect(Collectors.toList()); }).collect(Collectors.toList());
changeFlowVO.setItemBasicInfoList(itemBasicInfoVOS); changeFlowVO.setItemBasicInfoList(itemBasicInfoVOS);
} }
}
}
public ChangeFlowListVO query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) { public ChangeFlowListVO query(Integer page, Integer pageSize, ChangeFlowListQueryReq changeFlowListQueryReq) {
log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize, log.info("[query] page:{}, pageSize:{}, changeFlowListQueryReq:{}", page, pageSize,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment