From 5127f700b527ce698195f4b8ecbc1b9b3ff82560 Mon Sep 17 00:00:00 2001
From: taozi <552920369@qq.com>
Date: Thu, 6 Aug 2020 11:21:24 +0800
Subject: [PATCH] =?UTF-8?q?bug--=E7=A0=8D=E4=BB=B7id=E4=BC=A0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cart/service/impl/YxStoreCartServiceImpl.java        | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java
index a4eb21f7..ea0e2fb6 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/service/impl/YxStoreCartServiceImpl.java
@@ -338,7 +338,8 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
                     .one();
             if(storeCombination == null) throw new YshopException("该产品已下架或删除");
             if(storeCombination.getStock() < cartNum) throw new YshopException("该产品库存不足");
-        }else if(seckillId != null && seckillId > 0){//秒杀
+            //秒杀
+        }else if(seckillId != null && seckillId > 0){
             YxStoreSeckill yxStoreSeckill = storeSeckillService
                     .lambdaQuery().eq(YxStoreSeckill::getId,seckillId)
                     .eq(YxStoreSeckill::getIsShow, ShopCommonEnum.SHOW_1.getValue())
@@ -358,10 +359,10 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
             if(yxStoreSeckill.getNum() <= seckillOrderCount || yxStoreSeckill.getNum() < cartNum){
                 throw new YshopException("每人限购:"+yxStoreSeckill.getNum()+"件");
             }
-
-        }else if(bargainId != null && bargainId > 0){//砍价
+            //砍价
+        }else if(bargainId != null && bargainId > 0){
             YxStoreBargain yxStoreBargain = storeBargainService
-                    .lambdaQuery().eq(YxStoreBargain::getId,seckillId)
+                    .lambdaQuery().eq(YxStoreBargain::getId,bargainId)
                     .eq(YxStoreBargain::getStatus, ShopCommonEnum.IS_STATUS_1.getValue())
                     .le(YxStoreBargain::getStartTime,now)
                     .ge(YxStoreBargain::getStopTime,now)