修改

xuhy

2024-09-10 da392a50b1ea129d1626c1936f0b5ed5ed457b30

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOrderMealServiceImpl.java

@@ -84,7 +84,8 @@
                    orderMealGood.setGoodsCount(item.getGoodsCount());
                    orderMealGood.setGoodsSalePrice(item1.getSalePrice().multiply(new BigDecimal(item.getGoodsCount())));
                    orderMealGood.setCostPrice(item1.getCostPrice().multiply(new BigDecimal(item.getGoodsCount())));
//                    orderMealGood.setTypeId(item1.getTypeId());
                    orderMealGood.setTypeId(item1.getTypeId());
                    orderMealGood.setGoodsId(item1.getId());
                    orderMealGood.setTypeName(list1.stream().filter(item2 -> item2.getId().equals(item1.getTypeId())).findFirst().get().getTypeName());
                    orderMealGoods.add(orderMealGood);
                });
@@ -124,7 +125,8 @@
                orderMealGood.setGoodsPicture(item1.getGoodsPicture());
                orderMealGood.setGoodsCount(item.getGoodsCount());
                orderMealGood.setGoodsSalePrice(item1.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount())));
//                orderMealGood.setTypeId(item1.getTypeId());
                orderMealGood.setTypeId(item1.getTypeId());
                orderMealGood.setGoodsId(item1.getId());
                orderMealGood.setTypeName(list1.stream().filter(item2 -> item2.getId().equals(item1.getTypeId())).findFirst().get().getTypeName());
                orderMealGoods.add(orderMealGood);
            });
@@ -191,12 +193,14 @@
            List<TOrderMealGoods> list1 = orderMealGoodsService.list(Wrappers.lambdaQuery(TOrderMealGoods.class)
                    .eq(TOrderMealGoods::getOrderId, tOrderMealVO.getId()));
            tOrderMealVO.setOrderMealGoods(list1);
            Map<String, List<TOrderMealGoods>> map = list1.stream().collect(Collectors.groupingBy(TOrderMealGoods::getTypeName));
            List<String> goodsList = new ArrayList<>();
            map.forEach((k,v)->{
                goodsList.add(k+":"+v.stream().map(item->item.getGoodsName()+" "+(item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount())))).collect(Collectors.joining(",")));
            });
            tOrderMealVO.setGoodsList(goodsList);
            if(!CollectionUtils.isEmpty(list1)){
                Map<String, List<TOrderMealGoods>> map = list1.stream().collect(Collectors.groupingBy(TOrderMealGoods::getTypeName));
                List<String> goodsList = new ArrayList<>();
                map.forEach((k,v)->{
                    goodsList.add(k+":"+v.stream().map(item->item.getGoodsName()+" "+(item.getGoodsSalePrice().multiply(new BigDecimal(item.getGoodsCount())))).collect(Collectors.joining(",")));
                });
                tOrderMealVO.setGoodsList(goodsList);
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;