Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-22 0c3d9face27e194906bffe046a81b01e18faaef4

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -1612,6 +1612,15 @@
    R listSavePopulationServeExcelVO(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 确认导入实有人口（有则更新，无则新建）
     * @param list  用户信息
     * @param communityId   社区id
     * @return  导入结果
     */
    @PostMapping("/common/data/population/import/confirm")
    R listSavePopulationConfirm(@RequestBody List<ComMngPopulationServeExcelVO> list, @RequestParam(value = "communityId") Long communityId);

    /**
     * 分页查询实有人口
     *
     * @param comMngPopulationVO 查询参数
@@ -1918,6 +1927,14 @@
    R shopCartList(@RequestParam("userId") Long userId);

    /**
     * 查询用户购物车数量
     * @param userId    用户id
     * @return  用户购物车商品数量
     */
    @PostMapping("/shop/shopCartUserTotal")
    R shopCartUserTotal(@RequestParam("userId") Long userId);

    /**
     * 购物车添加
     * @param comShopCartDTO    请求参数
     * @return  购物车列表