diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java index 56621bd8..b1e5c7be 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java @@ -408,13 +408,14 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl tmp.getAwardsValue() > bdAwards.getAwardsValue()) .min(Comparator.comparingInt(BdAwards::getAwardsValue)).get(); resultVO.setTarAwardsName(nextBdAwards.getAwardsName()); + resultVO.setTargetPv(nextBdAwards.getCommunityCheck().divide(big10000, 2, BigDecimal.ROUND_FLOOR)); if (resultVO.getASumRealPv().compareTo(resultVO.getBSumRealPv()) <= 0) { // 左区 小于等于 右区,左区为小区 - resultVO.setTargetPv(nextBdAwards.getCommunityCheck().subtract(resultVO.getASumRealPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setSumRealPv(nextBdAwards.getCommunityCheck().subtract(resultVO.getASumRealPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR)); } else { // 右区为小区 - resultVO.setTargetPv(nextBdAwards.getCommunityCheck().subtract(resultVO.getBSumRealPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR)); + resultVO.setSumRealPv(nextBdAwards.getCommunityCheck().subtract(resultVO.getBSumRealPv()).divide(big10000, 2, BigDecimal.ROUND_FLOOR)); } } diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberAwardsNewVO.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberAwardsNewVO.java index 7efffcde..d5912b70 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberAwardsNewVO.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/vo/MemberAwardsNewVO.java @@ -48,6 +48,12 @@ public class MemberAwardsNewVO implements Serializable { @BigDecimalFormat() private BigDecimal targetPv; + /** + * 小区累计业绩 + */ + @BigDecimalFormat() + private BigDecimal sumRealPv; + /** * 目标奖衔名称 */