## 调整首页奖衔取值;
This commit is contained in:
parent
0a0016d2e8
commit
53dc1e5bcd
|
@ -358,8 +358,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
CuMemberAwardsUnderVO resultVO = CuMemberAwardsUnderVO.builder()
|
CuMemberAwardsUnderVO resultVO = CuMemberAwardsUnderVO.builder()
|
||||||
.aNewPv(BigDecimal.ZERO)
|
.aNewPv(BigDecimal.ZERO)
|
||||||
.bNewPv(BigDecimal.ZERO)
|
.bNewPv(BigDecimal.ZERO)
|
||||||
.aMonthPv(todayPv.getANewPv())
|
.aMonthPv(BigDecimalUtil.handleBig10000Down(todayPv.getANewPv()))
|
||||||
.bMonthPv(todayPv.getBNewPv())
|
.bMonthPv(BigDecimalUtil.handleBig10000Down(todayPv.getBNewPv()))
|
||||||
.aSumPv(BigDecimal.ZERO)
|
.aSumPv(BigDecimal.ZERO)
|
||||||
.bSumPv(BigDecimal.ZERO)
|
.bSumPv(BigDecimal.ZERO)
|
||||||
.aSumRealPv(BigDecimal.ZERO)
|
.aSumRealPv(BigDecimal.ZERO)
|
||||||
|
@ -384,8 +384,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
if (null != awardsUnderVO) {
|
if (null != awardsUnderVO) {
|
||||||
resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
|
resultVO.setANewPv(null != awardsUnderVO.getANewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getANewPv()) : BigDecimal.ZERO);
|
||||||
resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);
|
resultVO.setBNewPv(null != awardsUnderVO.getBNewPv() ? BigDecimalUtil.handleBig10000Down(awardsUnderVO.getBNewPv()) : BigDecimal.ZERO);
|
||||||
resultVO.setAMonthPv(null != awardsUnderVO.getAMonthPv() ? BigDecimalUtil.handleBig10000Down(todayPv.getANewPv().add(awardsUnderVO.getAMonthPv())) : todayPv.getANewPv());
|
resultVO.setAMonthPv(null != awardsUnderVO.getAMonthPv() ? BigDecimalUtil.handleBig10000Down(todayPv.getANewPv().add(awardsUnderVO.getAMonthPv())) : BigDecimalUtil.handleBig10000Down(todayPv.getANewPv()));
|
||||||
resultVO.setBMonthPv(null != awardsUnderVO.getBMonthPv() ? BigDecimalUtil.handleBig10000Down(todayPv.getBNewPv().add(awardsUnderVO.getBMonthPv())) : todayPv.getBNewPv());
|
resultVO.setBMonthPv(null != awardsUnderVO.getBMonthPv() ? BigDecimalUtil.handleBig10000Down(todayPv.getBNewPv().add(awardsUnderVO.getBMonthPv())) : BigDecimalUtil.handleBig10000Down(todayPv.getBNewPv()));
|
||||||
resultVO.setASumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO);
|
resultVO.setASumPv(null != awardsUnderVO.getASumPv() ? awardsUnderVO.getASumPv() : BigDecimal.ZERO);
|
||||||
resultVO.setBSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO);
|
resultVO.setBSumPv(null != awardsUnderVO.getBSumPv() ? awardsUnderVO.getBSumPv() : BigDecimal.ZERO);
|
||||||
resultVO.setASumRealPv(null != awardsUnderVO.getASumRealPv() ? awardsUnderVO.getASumRealPv() : BigDecimal.ZERO);
|
resultVO.setASumRealPv(null != awardsUnderVO.getASumRealPv() ? awardsUnderVO.getASumRealPv() : BigDecimal.ZERO);
|
||||||
|
@ -412,17 +412,17 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
|
||||||
|
|
||||||
if (resultVO.getASumRealPv().compareTo(resultVO.getBSumRealPv()) <= 0) {
|
if (resultVO.getASumRealPv().compareTo(resultVO.getBSumRealPv()) <= 0) {
|
||||||
// 左区 小于等于 右区,左区为小区
|
// 左区 小于等于 右区,左区为小区
|
||||||
resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv()));
|
resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv().add(todayPv.getANewPv())));
|
||||||
} else {
|
} else {
|
||||||
// 右区为小区
|
// 右区为小区
|
||||||
resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv()));
|
resultVO.setSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv().add(todayPv.getBNewPv())));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
resultVO.setASumPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumPv()));
|
resultVO.setASumPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumPv()));
|
||||||
resultVO.setBSumPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumPv()));
|
resultVO.setBSumPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumPv()));
|
||||||
resultVO.setASumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv().add(todayPv.getANewPv())));
|
resultVO.setASumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getASumRealPv()));
|
||||||
resultVO.setBSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv().add(todayPv.getBNewPv())));
|
resultVO.setBSumRealPv(BigDecimalUtil.handleBig10000Down(resultVO.getBSumRealPv()));
|
||||||
return resultVO;
|
return resultVO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue