From c3a00bc345400f5bd0294781a5944affd7250ce4 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 13 Oct 2025 09:23:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?##=20Fix=20-=20=E5=B8=82=E5=9C=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=BC=82=E5=B8=B8[http://47.94.148.201:8081/index.php?= =?UTF-8?q?=3Fm=3Dbug&f=3Dview&bugID=3D436]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hzs/retail/member/utils/DataStatisticsUtil.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java index e4e6dcab..5e87b922 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java @@ -54,9 +54,12 @@ public class DataStatisticsUtil { // excludeDailySettlementData(detailVOList); // } CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId); - BigDecimal smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv()); - if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) { - smallRangeTotalPv = BigDecimal.ZERO; + BigDecimal smallRangeTotalPv = BigDecimal.ZERO; + if(ObjectUtil.isNotEmpty(bigRangePv)){ + smallRangeTotalPv = total.getTotalPv().subtract(bigRangePv.getTotalPv()); + if (smallRangeTotalPv.compareTo(BigDecimal.ZERO) < 0) { + smallRangeTotalPv = BigDecimal.ZERO; + } } return CuMemberRetailDataStatisticsResultVO.builder() .totalPv(formatPV(total.getTotalPv())) From eb781fbecc4fe308a08f475d25c461d15bda9709 Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Mon, 13 Oct 2025 09:27:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?##=20Fix=20-=20=E5=B8=82=E5=9C=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=BC=82=E5=B8=B8[http://47.94.148.201:8081/index.php?= =?UTF-8?q?=3Fm=3Dbug&f=3Dview&bugID=3D435]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CuMemberRetailAchieveServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java index 4d21136f..a66d3e43 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java @@ -349,6 +349,13 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); // pkMemberList.add(userId); + if(CollUtil.isEmpty(pkMemberList)){ + return CuMemberRetailDataStatisticsResultVO.builder() + .totalPv(BigDecimal.ZERO) + .bigRangeTotalPv(BigDecimal.ZERO) + .smallRangeTotalPv(BigDecimal.ZERO) + .build(); + } CuMemberRetailAchieveVO memberAchieveVO = CuMemberRetailAchieveVO.builder() .memberRetailTable(memberRetailTable) .memberRetailSTable(memberSecondTable)