From 77d3a673d177acc61653463a23cdba43d4c9dd05 Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Tue, 24 Oct 2023 11:19:56 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E7=9A=84=E6=B7=BB=E5=8A=A0=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ARW.Service/Business/BusinessService/Carts/CartService.cs    | 2 +-
 .../Api/GoodsManager/Goodss/GoodsApiController.cs            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ARW.Service/Business/BusinessService/Carts/CartService.cs b/ARW.Service/Business/BusinessService/Carts/CartService.cs
index 4b8aa08..8aec35d 100644
--- a/ARW.Service/Business/BusinessService/Carts/CartService.cs
+++ b/ARW.Service/Business/BusinessService/Carts/CartService.cs
@@ -78,7 +78,7 @@ namespace ARW.Service.Business.BusinessService.Carts
             }
             else
             {
-                var cart = await _CartRepository.GetFirstAsync(s => s.GoodsGuid == model.GoodsGuid && s.GoodsSkuId == model.GoodsSkuId);
+                var cart = await _CartRepository.GetFirstAsync(s => s.CustomerGuid == model.CustomerGuid && s.GoodsGuid == model.GoodsGuid && s.GoodsSkuId == model.GoodsSkuId && s.IsDelete == false);
                 if (cart != null)
                 {
                     cart.CartGoodsNum += model.CartGoodsNum;
diff --git a/ARW.WebApi/Controllers/Api/GoodsManager/Goodss/GoodsApiController.cs b/ARW.WebApi/Controllers/Api/GoodsManager/Goodss/GoodsApiController.cs
index 2dc5890..b55aef3 100644
--- a/ARW.WebApi/Controllers/Api/GoodsManager/Goodss/GoodsApiController.cs
+++ b/ARW.WebApi/Controllers/Api/GoodsManager/Goodss/GoodsApiController.cs
@@ -77,9 +77,12 @@ namespace ARW.WebApi.Controllers.Api.GoodsManager.Goodss
         public async Task<IActionResult> GetGoodsDetails([FromQuery] GoodsDtoApi parm)
         {
             //if (parm == null) throw new CustomException("参数错误！");
+            long userId = 0;
             var user = JwtUtil.GetLoginUser(App.HttpContext);
+            if (user != null)
+                userId = user.UserId;
 
-            var res = await _GoodsServiceApi.GetGoodsDetails(parm, user.UserId);
+            var res = await _GoodsServiceApi.GetGoodsDetails(parm, userId);
 
             if (res != "[]")
             {