From aa02a165eea629fa89d1ff47531ce861cd9fa3bc Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 29 Sep 2021 10:50:56 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

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 de9485c..3230d0d 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
@@ -101,7 +101,12 @@
             }
 
             if (sku.getStock() < item.getCnt()) {
-                throw new FebsException("库存不足");
+                throw new FebsException(sku.getSkuName() + "库存不足");
+            }
+
+            MallGoods mallGoods = mallGoodsMapper.selectById(sku.getGoodsId());
+            if (MallGoods.ISSALE_STATUS_DISABLED.equals(mallGoods.getIsSale())) {
+                throw new FebsException(mallGoods.getGoodsName() + "已下架");
             }
 
             MallOrderItem orderItem = new MallOrderItem();
@@ -200,6 +205,9 @@
                 }
 
                 memberService.addMoneyFlow(member.getId(), orderInfo.getAmount().negate(), MoneyFlowTypeEnum.PAY.getValue(), orderInfo.getOrderNo(), null, null, null, null);
+
+                agentProducer.sendAutoLevelUpMsg(member.getId());
+                agentProducer.sendReturnMoneyMsg(orderInfo.getId());
             default:
 
         }
@@ -211,8 +219,6 @@
         map.put("orderNo", orderInfo.getOrderNo());
         map.put("orderId", orderInfo.getId());
 
-//        agentProducer.sendAutoLevelUpMsg(member.getId());
-//        agentProducer.sendReturnMoneyMsg(orderInfo.getId());
         return map;
     }
 

--
Gitblit v1.9.1