From eb5e79a88019b3c2f2129ebf833e5f7813713fa3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 07 Sep 2022 16:01:57 +0800
Subject: [PATCH] 20220902

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    3 ++-
 src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java        |    4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
index a475bc2..55b08e3 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/ApiMallGoodsController.java
@@ -44,8 +44,8 @@
             @ApiResponse(code = 200, message = "success", response = MallGoodsDetailsVo.class)
     })
     @GetMapping(value = "/findMallGoodsDetailsById/{id}")
-    public FebsResponse findMallGoodsDetailsById(@PathVariable("id") String id) {
-        return new FebsResponse().success().data(mallGoodsService.findMallGoodsDetailsById(Long.parseLong(id)));
+    public FebsResponse findMallGoodsDetailsById(@PathVariable("id") Long id) {
+        return new FebsResponse().success().data(mallGoodsService.findMallGoodsDetailsById(id));
     }
 
     @ApiOperation(value = "获取商品评价", notes = "获取商品评价")
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 3b7b6ca..fd7ac30 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -462,7 +462,8 @@
     @Override
     public OrderDetailVo findOrderDetailsById(Long id) {
         MallOrderInfo orderInfo = this.baseMapper.selectOrderDetailsById(id);
-        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
+//        if (orderInfo == null || AppContants.DEL_FLAG_Y == orderInfo.getDelFlag()) {
+        if (ObjectUtil.isNull(orderInfo)) {
             throw new FebsException("订单不存在");
         }
 

--
Gitblit v1.9.1