From 98e06673cc0858aebed99c4e9550d2d71d838e6f Mon Sep 17 00:00:00 2001
From: chenye <chenye0811@qq.com>
Date: 星期一, 10 七月 2023 09:03:47 +0800
Subject: [PATCH] 空值判断
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
index c504bbb..1a0a4f2 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -678,12 +678,12 @@
MerHomeShopTotalVo merHomeShopTotalVo = new MerHomeShopTotalVo();
merHomeShopTotalVo.setShopIds(shopIds);
MerHomeShopTotalVo orderVo = remoteOrderService.getMerHomeTotal(merHomeShopTotalVo).getData();
- merHomeShopTotalVo.setTodayShop(orderVo.getTodayShop());
- merHomeShopTotalVo.setUnHandleOrder(orderVo.getUnHandleOrder());
- merHomeShopTotalVo.setShopTurnover(orderVo.getShopTurnover());
+ merHomeShopTotalVo.setTodayShop(null!=orderVo?orderVo.getTodayShop():0);
+ merHomeShopTotalVo.setUnHandleOrder(null!=orderVo?orderVo.getUnHandleOrder():0);
+ merHomeShopTotalVo.setShopTurnover(null!=orderVo?orderVo.getShopTurnover():BigDecimal.ZERO);
ShopTotal shopTotal = shopTotalService.shopsTotalByIds(shopIds);
- merHomeShopTotalVo.setCycleSurp(shopTotal.getUseableCyclePerson());
- merHomeShopTotalVo.setExplorationSurp(shopTotal.getUseableExperiencePerson());
+ merHomeShopTotalVo.setCycleSurp(null!=shopTotal?shopTotal.getUseableCyclePerson():0);
+ merHomeShopTotalVo.setExplorationSurp(null!=shopTotal?shopTotal.getUseableExperiencePerson():0);
Integer taskCount = memberTaskService.getMembersIngTotal(shopIds);
merHomeShopTotalVo.setTask(taskCount);
return merHomeShopTotalVo;
--
Gitblit v1.7.1