Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-06 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java

@@ -86,12 +86,14 @@

            OrderGoodsVO orderGoodsVO = new OrderGoodsVO();
            orderGoodsVO.setGoodsId(orderGood.getGoodsId());
            orderGoodsVO.setGoodsName(goods.getName());
            orderGoodsVO.setType(goods.getType());
            orderGoodsVO.setNum(orderGood.getNum());
            orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
            orderGoodsVO.setSellingPrice(goods.getSellingPrice());
            orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
            if (goods != null){
                orderGoodsVO.setGoodsName(goods.getName());
                orderGoodsVO.setType(goods.getType());
                orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
                orderGoodsVO.setSellingPrice(goods.getSellingPrice());
                orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
            }
            goodsList.add(orderGoodsVO);
        }