Merge remote-tracking branch 'origin/master'

huanghongfa

2021-04-20 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596

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

@@ -619,6 +619,12 @@
    @Override
    public R getFundsStat(Long userId) {
        ComShopFundsVO comShopFundsVO = comShopOrderDAO.queryStatis(userId);
        if(comShopFundsVO==null){
            comShopFundsVO = new ComShopFundsVO();
            comShopFundsVO.setMonthTotal(new BigDecimal(0));
            comShopFundsVO.setTodayTotal(new BigDecimal(0));
            comShopFundsVO.setWeekTotal(new BigDecimal(0));
        }
        return R.ok(comShopFundsVO);
    }