From 6ac0849d13ec2f178b2daa6cd3e63bbe9fdde596 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期二, 20 四月 2021 21:22:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
index 6b120cf..9d08cae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopOrderServiceImpl.java
+++ b/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);
     }
 

--
Gitblit v1.7.1