czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into prod

Browse Source
This commit is contained in:
wangw
2025-11-11 17:15:02 +08:00
parent 835222c0c5 3d7e8e8ebd
commit b957a6ce50
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java
View File

@@ -152,10 +152,11 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
String productName = param.getProductName(); String productName = param.getProductName();
List<Long> like = null; List<Long> like = null;
if (StrUtil.isNotBlank(productName)) { if (StrUtil.isNotBlank(productName)) {
like = orderDetailService.queryChain() QueryWrapper queryWrapper = QueryWrapper.create();
.select(OrderDetail::getOrderId) queryWrapper.select(OrderDetail::getOrderId)
.eq(OrderDetail::getShopId, param.getShopId()) .eq(OrderDetail::getShopId, param.getShopId())
.like(OrderDetail::getProductName, productName).listAs(Long.class); .like(OrderDetail::getProductName, productName);
like = orderDetailService.listAs(queryWrapper, Long.class);
if (CollUtil.isEmpty(like)) { if (CollUtil.isEmpty(like)) {
return new Page<>(); return new Page<>();
} }
@@ -177,7 +178,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
Page<OrderInfoVo> orderInfoVoPage = pageAs(PageUtil.buildPage(), queryWrapper, OrderInfoVo.class); Page<OrderInfoVo> orderInfoVoPage = pageAs(PageUtil.buildPage(), queryWrapper, OrderInfoVo.class);
orderInfoVoPage.getRecords().parallelStream().forEach(s -> { orderInfoVoPage.getRecords().parallelStream().forEach(s -> {
List<OrderDetailSmallVO> orderDetails = orderDetailService.listAs( List<OrderDetailSmallVO> orderDetails = orderDetailService.listAs(
QueryWrapper.create().eq(OrderDetail::getOrderId,s.getId()).eq(OrderDetail::getShopId,s.getShopId()),OrderDetailSmallVO.class); QueryWrapper.create().eq(OrderDetail::getOrderId, s.getId()).eq(OrderDetail::getShopId, s.getShopId()), OrderDetailSmallVO.class);
s.setGoods(orderDetails); s.setGoods(orderDetails);
s.setShopName(shopMap.get(Long.parseLong(s.getShopId()))); s.setShopName(shopMap.get(Long.parseLong(s.getShopId())));
}); });