From 2530099d143123f89ecdef3df6ef95cb6b7162e8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 31 七月 2025 11:38:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
index 0d2d51b..801b6af 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java
@@ -231,8 +231,11 @@
@ResponseBody
@RequestMapping(value = "/addOrder", method = RequestMethod.POST)
public R addOrder(@RequestBody AddOrderVo orderVo){
- Goods goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
- orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsNum(), orderVo.getId(), 2);
+ Goods goods = null;
+ if(null != orderVo.getGoodsId()){
+ goods = remoteGoodsService.getGoods(orderVo.getGoodsId()).getData();
+ }
+ orderService.addOrder(orderVo.getShopId(), orderVo.getUserId(), goods, orderVo.getGoodsName(), orderVo.getGoodsNum(), orderVo.getId(), 2);
return R.ok();
}
}
--
Gitblit v1.7.1