From 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期五, 06 十二月 2024 18:08:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java | 14 ++++++--------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 12 +++++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index f4029b3..9bfd041 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/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);
}
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
index 199cf75..23e1522 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -853,14 +853,12 @@
orderGood.setSeckillJson(JSON.toJSONString(goodsSeckill));
}
for (int i = 0; i < objects.size(); i++) {
- Long id = objects.getJSONObject(i).getLong("id");
- if(myShoppingCartVo.getId().equals(id)){
- Integer num1 = objects.getJSONObject(i).getInteger("num");
- orderGood.setNum(num1);
- Goods goods1 = goodsClient.getGoodsById(myShoppingCartVo.getGoodsId()).getData();
- orderGood.setGoodJson(JSON.toJSONString(goods1));
- break;
- }
+ Integer id = objects.getJSONObject(i).getInteger("id");
+ Integer num1 = objects.getJSONObject(i).getInteger("num");
+ orderGood.setNum(num1);
+ Goods goods1 = goodsClient.getGoodsById(id).getData();
+ orderGood.setGoodJson(JSON.toJSONString(goods1));
+ break;
}
orderGood.setDelFlag(0);
orderGood.setCreateTime(LocalDateTime.now());
--
Gitblit v1.7.1