From 99033b66cd19e20ac41fc9dc7fc2f2a59e0f7b9f Mon Sep 17 00:00:00 2001 From: sangelxiu1 <15781802@163.com> Date: Tue, 1 Jul 2025 14:16:54 +0800 Subject: [PATCH] =?UTF-8?q?##=20Fix=20-=20=E3=80=90H5=E3=80=91=E7=BA=A2?= =?UTF-8?q?=E6=A1=86=E4=B8=AD=E7=9A=84=E7=9B=92=E6=95=B0=E9=83=BD=E5=BE=97?= =?UTF-8?q?=E4=BF=9D=E7=95=992=E4=B8=BA=E5=B0=8F=E6=95=B0[214]=20&=20?= =?UTF-8?q?=E3=80=90H5=E3=80=91=E6=B5=8B=E8=AF=95=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=EF=BC=8CBF28195798=E8=BF=99=E4=B8=AA=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=BC=9E=E4=B8=8B=E4=B8=80=E4=B8=AA=E4=BA=BA=E9=83=BD=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=EF=BC=8C=E4=BB=96=E5=B8=82=E5=9C=BA=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=8B=E9=9D=A2=E6=97=A0=E6=95=B0=E4=B8=AA=E4=BA=BA[215]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CuMemberRetailAchieveServiceImpl.java | 3 +++ .../retail/member/vo/CuMemberRetailAchieveVO.java | 3 +++ .../retail/member/vo/MarketDynamicsDetailVO.java | 15 ++++++++++----- 3 files changed, 16 insertions(+), 5 deletions(-) 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 f117bcdb..de6ec00a 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 @@ -610,6 +610,9 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType); + if(CollUtil.isEmpty(pkMemberList)){ + return new PageResult(0, new ArrayList<>()); + } param.setPkIdList(pkMemberList); List detailVOList = baseMapper.getMarketDynamicsDetail(param); log.info("detailVOList : {}", JSONUtil.toJsonStr(detailVOList)); diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java index de2229d0..593613bd 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/CuMemberRetailAchieveVO.java @@ -62,17 +62,20 @@ public class CuMemberRetailAchieveVO implements Serializable { /** * 总盒数 */ + @BigDecimalFormat private BigDecimal totalBox; /** * 小市场盒数 */ + @BigDecimalFormat private BigDecimal smallAreaBox; /** * 大市场盒数 */ + @BigDecimalFormat private BigDecimal bigAreaBox; /** diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/MarketDynamicsDetailVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/MarketDynamicsDetailVO.java index fc0ac86b..c7624c93 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/MarketDynamicsDetailVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/vo/MarketDynamicsDetailVO.java @@ -64,22 +64,27 @@ public class MarketDynamicsDetailVO implements Serializable { /** * 今日盒数 */ - private Integer todayBoxNum; + @BigDecimalFormat + private BigDecimal todayBoxNum; /** * 昨日盒数 */ - private Integer yesterdayBoxNum; + @BigDecimalFormat + private BigDecimal yesterdayBoxNum; /** * 本月盒数 */ - private Integer currentMonthBoxNum; + @BigDecimalFormat + private BigDecimal currentMonthBoxNum; /** * 上月盒数 */ - private Integer lastMonthBoxNum; + @BigDecimalFormat + private BigDecimal lastMonthBoxNum; /** * 累计消费盒数 */ - private Integer totalBoxNum; + @BigDecimalFormat + private BigDecimal totalBoxNum; }