Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopCartServiceImpl.java

@@ -69,6 +69,7 @@
                    ComShopCartVO invalidCart = new ComShopCartVO();
                    BeanUtils.copyProperties(shopCart,invalidCart);
                    invalidCartList.add(invalidCart);
                    return;
                }

                //有效商品区分店铺
@@ -207,4 +208,28 @@
            return R.fail("修改失败");
        }
    }

    /**
     * 查询用户购物车商品数量
     * @param userId    用户id
     * @return  用户购物车商品数量
     */
    public R shopCartUserTotal(Long userId){
        int goodsNum = 0;
        //查询用户购物车所有商品集合
        List<ComShopCartDO> shopCartDOList = this.baseMapper.selectList(new QueryWrapper<ComShopCartDO>().eq("user_id",userId));
        if(!shopCartDOList.isEmpty()){
            for (ComShopCartDO cartDO:shopCartDOList) {
                //查询当前商品是否是有效商品
                ComShopGoodsDO  goodsDO = shopGoodsDAO.selectOne(new QueryWrapper<ComShopGoodsDO>()
                        .eq("id",cartDO.getGoodsId()).eq("delete_status",ComShopGoodsDO.deleteStatus.no)
                        .eq("status",ComShopGoodsDO.status.sell));

                if(goodsDO != null){
                    goodsNum++;
                }
            }
        }
        return R.ok(goodsNum);
    }
}