From 8f35d5e547ec794bd377e6bd23e06fa120f0b75c Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 8 May 2025 13:34:58 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E5=BD=93=E6=97=A5=E6=96=B0=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E6=9C=88=E5=BA=A6=E4=B8=9A=E7=BB=A9=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../achieve/service/impl/CuMemberAchieveServiceImpl.java    | 5 +++--
 .../java/com/hzs/member/achieve/vo/MemberAwardsNewVO.java   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

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<CuMemberAchieveMappe
                     .filter(tmp -> 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;
+
     /**
      * 目标奖衔名称
      */