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; }