From c6889419ea24a8df72b654f30b3851f1172e3499 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 30 四月 2024 23:49:44 +0800
Subject: [PATCH] bug修复
---
meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
index 882d75f..69fea03 100644
--- a/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
+++ b/meiya-rest/src/main/java/com/sinata/rest/modular/mall/service/impl/MallOrderServiceImpl.java
@@ -242,8 +242,9 @@
if(skuVo.getStock() < boSku.getGoodsNum()) {
return ApiUtils.returnNG(null, "商品：" + skuVo.getGoodsName() + "，库存不足");
}
+ log.info("商品：{},减去库存：{}",skuVo,boSku.getGoodsNum());
// 减去库存
- goodsSkuService.updateStock(skuVo.getSkuId(), -boSku.getGoodsNum());
+ goodsSkuService.updateStock(skuVo.getId(), -1 * boSku.getGoodsNum());
// 商品价格
BigDecimal sellCost;
@@ -253,7 +254,7 @@
// 美天销售价
sellCost = skuVo.getPriceSale();
} else {
- if (user != null && user.getMemberGradeId() != EnumMemberGrade.G_1.index) {
+ if (user != null && user.getMemberGradeId() != EnumMemberGrade.G_1.index && EnumMemberGrade.G_2.index != user.getMemberGradeId()) {
// 会员价
sellCost = skuVo.getPriceMember();
} else {
@@ -270,7 +271,6 @@
// 销售价
sellCost = skuVo.getPriceMerchant();
}
-
// 查询套餐规格组ID
MallGroupSpec mallGroupSpec = mallGroupSpecService.getById(skuVo.getSpecIds());
List<GroupSpecGoodsSkuJsonVo> groupSpecGoodsSkuJsonVoList = JSONUtil.parseArray(mallGroupSpec.getGoodsSkuJson()).toList(GroupSpecGoodsSkuJsonVo.class);
@@ -535,11 +535,13 @@
.select(MallOrderDetail::getSkuId, MallOrderDetail::getGoodsNum)
.eq(MallOrderDetail::getOrderNo, orderNo);
List<MallOrderDetail> orderDetails = orderDetailService.list(orderDetailLambdaQueryWrapper);
+ log.info("-----------------------开始退回库存--------------------");
+ log.info("orderDetails:{}", JSON.toJSONString(orderDetails));
for (MallOrderDetail od : orderDetails) {
// 增加库存
goodsSkuService.updateStock(od.getSkuId(), od.getGoodsNum());
}
-
+ log.info("-----------------------退回库存结束--------------------");
if (order.getCouponId() != null && order.getCouponId() != 0) {
// 退还优惠券
myCouponService.updateUseCoupon(order.getUserId(), order.getCouponId(), 0);
--
Gitblit v1.7.1