## Fix - 【H5】红框中的盒数都得保留2为小数[214] & 【H5】测试环境,BF28195798这个会员伞下一个人都没有,他市场动态下面无数个人[215]
This commit is contained in:
parent
291540a7fe
commit
01ea3d0601
|
@ -610,6 +610,9 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
|
||||||
param.setLastMonthTableName(getDayTableName(param.getLastMonthDate()));
|
param.setLastMonthTableName(getDayTableName(param.getLastMonthDate()));
|
||||||
log.info("MarketDynamicsQueryDateParam : {}", JSONUtil.toJsonStr(param));
|
log.info("MarketDynamicsQueryDateParam : {}", JSONUtil.toJsonStr(param));
|
||||||
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
|
List<Long> pkMemberList = baseMapper.selectDirectPushByPkMember(pkMember, systemType);
|
||||||
|
if(CollUtil.isEmpty(pkMemberList)){
|
||||||
|
return new PageResult<MarketDynamicsDetailVO>(0, new ArrayList<>());
|
||||||
|
}
|
||||||
param.setPkIdList(pkMemberList);
|
param.setPkIdList(pkMemberList);
|
||||||
List<MarketDynamicsDetailVO> detailVOList = baseMapper.getMarketDynamicsDetail(param);
|
List<MarketDynamicsDetailVO> detailVOList = baseMapper.getMarketDynamicsDetail(param);
|
||||||
log.info("detailVOList : {}", JSONUtil.toJsonStr(detailVOList));
|
log.info("detailVOList : {}", JSONUtil.toJsonStr(detailVOList));
|
||||||
|
|
|
@ -62,17 +62,20 @@ public class CuMemberRetailAchieveVO implements Serializable {
|
||||||
/**
|
/**
|
||||||
* 总盒数
|
* 总盒数
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal totalBox;
|
private BigDecimal totalBox;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 小市场盒数
|
* 小市场盒数
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal smallAreaBox;
|
private BigDecimal smallAreaBox;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 大市场盒数
|
* 大市场盒数
|
||||||
*/
|
*/
|
||||||
|
@BigDecimalFormat
|
||||||
private BigDecimal bigAreaBox;
|
private BigDecimal bigAreaBox;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue