From fdb6ddebb3309d8f0a856666f9b6cb7189780f10 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 25 Apr 2022 17:54:26 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 91b7378..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
@@ -1,5 +1,6 @@
package cc.mrbird.febs.mall.service.impl;
+import cc.mrbird.febs.common.enumerates.AgentLevelEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
import cc.mrbird.febs.common.enumerates.OrderRefundStatusEnum;
import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
@@ -100,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();
@@ -182,7 +188,6 @@
orderInfo.setPayOrderNo(payResultStr);
orderInfo.setPayMethod("支付宝支付");
-
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd());
@@ -193,7 +198,16 @@
orderInfo.setPayTime(new Date());
orderInfo.setPayResult("1");
+ MallMember mallMember = memberMapper.selectById(member.getId());
+ if (AgentLevelEnum.ZERO_LEVEL.name().equals(mallMember.getLevel())) {
+ mallMember.setLevel(AgentLevelEnum.FIRST_LEVEL.name());
+ memberMapper.updateById(mallMember);
+ }
+
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:
}
@@ -205,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