From 110de1d2a7aa1bd36b91c8d8b22032c1f432e499 Mon Sep 17 00:00:00 2001 From: JunFeng Wu Date: Wed, 26 Apr 2023 15:07:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8B=E5=8D=95=E6=9B=B4?= =?UTF-8?q?=E6=94=B9=E5=BA=93=E5=AD=98=E5=B9=B6=E5=8F=91=E8=B6=85=E4=B9=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=95=86?= =?UTF-8?q?=E5=93=81=E5=90=88=E5=B9=B6=E4=B8=8B=E5=8D=95=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=B8=AD=E4=B8=80=E5=95=86=E5=93=81=E5=BA=93=E5=AD=98=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=95=B4=E4=B8=AA=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E5=A4=B1=E8=B4=A5=20=E4=BF=AE=E5=A4=8D=E4=B8=8B?= =?UTF-8?q?=E5=8D=95=E6=9B=B4=E6=94=B9=E5=BA=93=E5=AD=98=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E5=BE=85=E6=94=AF=E4=BB=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Good/CoreCmsGoodsRepository.cs | 2 +- .../Order/CoreCmsOrderServices.cs | 61 ++++++++++++++++--- 2 files changed, 52 insertions(+), 11 deletions(-) diff --git a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs index a69c241..d59ef1f 100644 --- a/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs +++ b/CoreCms.Net.Repository/Good/CoreCmsGoodsRepository.cs @@ -803,7 +803,7 @@ namespace CoreCms.Net.Repository //更新记录。 bl = DbClient.Updateable() .SetColumns(it => it.freezeStock == it.freezeStock + num) - .Where(p => p.id == productModel.id && insertNum >= num).ExecuteCommandHasChange(); + .Where(p => p.id == productModel.id && insertNum >= num && p.freezeStock < p.stock).ExecuteCommandHasChange(); break; case "send": //发货 bl = DbClient.Updateable() diff --git a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs index 1a960ac..4584211 100644 --- a/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs +++ b/CoreCms.Net.Services/Order/CoreCmsOrderServices.cs @@ -249,24 +249,58 @@ namespace CoreCms.Net.Services //开始事务处理 await _dal.InsertAsync(order); - + //上面保存好订单表，下面保存订单的其他信息 if (orderItems != null) { jm.msg = "更改库存"; + // foreach (var item in orderItems) + // { + // var res = _goodsServices.ChangeStock(item.productId, GlobalEnumVars.OrderChangeStockType.order.ToString(), item.nums); + // if (res.status == false) + // { + // jm.msg = "更新库存数据失败"; + // return jm; + // } + // } + //更改库存 - foreach (var item in orderItems) + var avaliableOrderItems = orderItems.Where(item => { var res = _goodsServices.ChangeStock(item.productId, GlobalEnumVars.OrderChangeStockType.order.ToString(), item.nums); + if (res.status == false) { - - jm.msg = "更新库存数据失败"; - return jm; + jm.msg += $"{item.name}库存不足"; } + + return res.status; + + + }).ToList(); + + + if (avaliableOrderItems.Count == 0) + { + await _orderItemServices.InsertCommandAsync(orderItems); + + await _dal.UpdateAsync(n => new CoreCmsOrder() + { + status = (int)GlobalEnumVars.OrderStatus.Cancel, + updateTime = DateTime.Now + }, + m => m.orderId == order.orderId); + + //清除购物车信息 + await _cartServices.DeleteAsync(p => ids.Contains(p.id) && p.userId == userId && p.type == orderType); + + + jm.msg = "下单失败，库存不足"; + return jm; } - jm.msg = "订单明细更新" + orderItems.Count; - var outItems = await _orderItemServices.InsertCommandAsync(orderItems); + + jm.msg = "订单明细更新" + avaliableOrderItems.Count; + var outItems = await _orderItemServices.InsertCommandAsync(avaliableOrderItems); var outItemsBool = outItems > 0; if (outItemsBool == false) { @@ -275,6 +309,13 @@ namespace CoreCms.Net.Services jm.data = outItems; return jm; } + + + + + + + //优惠券核销 if (!string.IsNullOrEmpty(couponCode)) { @@ -304,21 +345,21 @@ namespace CoreCms.Net.Services break; case (int)GlobalEnumVars.OrderType.PinTuan: //拼团模式去校验拼团是否存在，并添加拼团记录 - var pinTuanRes = await _pinTuanRecordServices.OrderAdd(order, orderItems, teamId); + var pinTuanRes = await _pinTuanRecordServices.OrderAdd(order, avaliableOrderItems, teamId); if (pinTuanRes.status == false) { return pinTuanRes; } break; case (int)GlobalEnumVars.OrderType.Group: - var groupRes = await _promotionRecordServices.OrderAdd(order, orderItems, objectId, orderType); + var groupRes = await _promotionRecordServices.OrderAdd(order, avaliableOrderItems, objectId, orderType); if (groupRes.status == false) { return groupRes; } break; case (int)GlobalEnumVars.OrderType.Skill: - var rskillRes = await _promotionRecordServices.OrderAdd(order, orderItems, objectId, orderType); + var rskillRes = await _promotionRecordServices.OrderAdd(order, avaliableOrderItems, objectId, orderType); if (rskillRes.status == false) { return rskillRes; -- Gitee