|
@@ -65,6 +65,7 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
private LockedStockDetailManager lockedStockDetailManager;
|
|
private LockedStockDetailManager lockedStockDetailManager;
|
|
private OrderCustomerFeeManager orderCustomerFeeManager;
|
|
private OrderCustomerFeeManager orderCustomerFeeManager;
|
|
private RedisTemplate redisTemplate;
|
|
private RedisTemplate redisTemplate;
|
|
|
|
+ private AreaStockManager areaStockManager;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public WebPage<OrderVO> list(OrderQueryParams queryParams) {
|
|
public WebPage<OrderVO> list(OrderQueryParams queryParams) {
|
|
@@ -146,6 +147,8 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(productVO.getGoodsId()), GoodsVO.class);
|
|
GoodsVO goodsVO = BeanUtil.copyProperties(goodsMapper.selectById(productVO.getGoodsId()), GoodsVO.class);
|
|
dto.setGoodsVO(goodsVO);
|
|
dto.setGoodsVO(goodsVO);
|
|
dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
|
|
dto.setUsableStock(productStockManager.getById(dto.getProductStockId()).getUsableStock());
|
|
|
|
+ List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, dto.getProductStockId()));
|
|
|
|
+ dto.setAreaStockList(areaStockList);
|
|
}
|
|
}
|
|
//核销费用
|
|
//核销费用
|
|
List<OrderCustomerFee> orderCustomerFees = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, id));
|
|
List<OrderCustomerFee> orderCustomerFees = orderCustomerFeeManager.list(new LambdaQueryWrapper<OrderCustomerFee>().eq(OrderCustomerFee::getOrderId, id));
|
|
@@ -472,6 +475,8 @@ public class OrderManagerImpl extends BaseServiceImpl<OrderMapper, OrderDO> impl
|
|
List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
|
|
List<Long> collected = list2.stream().map(ItemSnCodeDO::getSnCodeId).collect(Collectors.toList());
|
|
itemDO.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
|
|
itemDO.setSnCodeList(goodsSnManager.list(new LambdaQueryWrapper<GoodsSnDO>().in(GoodsSnDO::getId, collected)));
|
|
}
|
|
}
|
|
|
|
+ List<AreaStock> areaStockList = areaStockManager.list(new LambdaQueryWrapper<AreaStock>().eq(AreaStock::getProductStockId, itemDO.getProductStockId()));
|
|
|
|
+ itemDO.setAreaStockList(areaStockList);
|
|
}
|
|
}
|
|
byId.setOrderVo(aDo);
|
|
byId.setOrderVo(aDo);
|
|
byId.setOrderItemVOS(bean);
|
|
byId.setOrderItemVOS(bean);
|