From 804af5560c1208fa2e300195fc0399dd3d9dd201 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Sat, 12 Sep 2020 07:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=B4=BB=E5=8A=A8=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=B8=8E=E6=99=AE=E9=80=9A=E5=95=86=E5=93=81=E7=9A=84?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cart/service/impl/YxStoreCartServiceImpl.java | 15 +++++++++++----
 1 file changed, 11 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 60460c80..871217fb 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
@@ -214,11 +214,19 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
                         //设置VIP价格
                         double vipPrice = userService.setLevelPrice(
                                 productAttrValue.getPrice().doubleValue(), uid);
-                        if (storeCart.getCombinationId() > 0 || storeCart.getSeckillId() > 0
-                                || storeCart.getBargainId() > 0) {
+                        //砍价金额
+                        if ( storeCart.getBargainId() > 0
+                               ) {
                             vipPrice = storeProduct.getPrice().doubleValue();
                         }
-
+                        //设置拼团价格
+                       if(storeCart.getCombinationId() > 0 ){
+                            vipPrice = productAttrValue.getPinkPrice().doubleValue();
+                        }
+                        //设置秒杀价格
+                        if( storeCart.getSeckillId() > 0){
+                            vipPrice = productAttrValue.getSeckillPrice().doubleValue();
+                        }
                         storeCartQueryVo.setTruePrice(vipPrice);
                         //设置会员价
                         storeCartQueryVo.setVipTruePrice(productAttrValue.getPrice()
@@ -261,7 +269,6 @@ public class YxStoreCartServiceImpl extends BaseServiceImpl<StoreCartMapper, YxS
 
     /**
      * 添加购物车
-     *
      * @param uid               用户id
      * @param productId         普通产品编号
      * @param cartNum           购物车数量