puzhibing
2025-01-15 8ca3e0a68dccb620913666e7dad59e00ce8794b6
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ShoppingCartServiceImpl.java
@@ -190,7 +190,7 @@
      info.setVip(appUser.getVipId());
      GoodsSeckill goodsSeckill = seckillActivityInfoClient.getSeckillActivityInfo(info).getData();
      //没有秒杀活动或者添加的普通商品则不使用秒杀活动价格
      if(null == goodsSeckill || type == 1){
      if((null == goodsSeckill || (null != goodsSeckill.getCashPayment() && null != goodsSeckill.getPointPayment())) || type == 1){
         //没有秒杀价,则判断门店特价
         GetGoodsBargainPrice goodsBargainPrice = new GetGoodsBargainPrice();
         goodsBargainPrice.setGoodsId(goodsId);
@@ -209,10 +209,10 @@
            area.setVip(appUser.getVipId());
            area.setGoodsId(goodsId);
            GoodsArea goodsArea = goodsAreaClient.getGoodsArea(area).getData();
            if(null == goodsArea){
            if(null == goodsArea || (null != goodsArea.getCashPayment() && null != goodsArea.getPointPayment())){
               //没有地区价格,则使用会员价格
               GoodsVip goodsVip = goodsVipClient.getGoodsVip(goodsId, appUser.getVipId()).getData();
               if(null == goodsVip){
               if(null == goodsVip || (null != goodsVip.getCashPayment() && null != goodsVip.getPointPayment())){
                  //没有配置价格,直接使用原始基础价格
                  return null;
               }else{
@@ -1007,7 +1007,7 @@
      }
      if(3 == shoppingCartPayment.getPaymentType()){
         Integer availablePoint = appUser.getAvailablePoint();
         if(availablePoint < orderPoint){
         if(availablePoint.compareTo(orderPoint) < 0){
            return R.fail("账户可用积分不足");
         }
      }