From eb9022a2e9437efe6d059895c42faa6d828cf221 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Mon, 15 Sep 2025 14:34:05 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=97=A5=E4=B8=9A=E7=BB=A9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=A4=8D=E8=B4=AD=E6=96=B0=E5=A2=97?=
 =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=A4=84=E7=90=86=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BonusSettlePurchaseHandle.java       |  8 +++----
 .../impl/CuMemberAchieveServiceImpl.java      | 22 ++++---------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
index 8d614c28..063dd408 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettlePurchaseHandle.java
@@ -199,10 +199,10 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
         if (settleExt == null) {
             return cuMemberBonusExpandList;
         }
-//        settleExt.setRepurchaseAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseAmount(), convertLocalCurrency(saOrderExt, bonusConfigDTO)));
-//        settleExt.setRepurchasePv(ComputeUtil.computeAdd(settleExt.getRepurchasePv(), saOrderExt.getOrderAchieve()));
-//        settleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseNewAmount(), convertLocalCurrency(saOrderExt, bonusConfigDTO)));
-//        settleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(settleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve()));
+        settleExt.setRepurchaseAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseAmount(), saOrderExt.getOrderAmount()));
+        settleExt.setRepurchasePv(ComputeUtil.computeAdd(settleExt.getRepurchasePv(), saOrderExt.getOrderAchieve()));
+        settleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(settleExt.getRepurchaseNewAmount(), saOrderExt.getOrderAmount()));
+        settleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(settleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve()));
 
         // 先计算新增，根据新增计算碰次
         // 先进行初始化所有的安置人，存储需要修改的值,cuMemberSettleExtMap最终修改的
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 5bd006e3..e2a17276 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
@@ -765,8 +765,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             rtupna.setDirectAchieve(BigDecimal.ZERO);
             return rtupna;
         }
-        R<CurrencyDTO> currency = iCurrencyServiceApi.getCurrency(SecurityUtils.getPkCountry());
-
         BigDecimal leftAchieve = BigDecimal.ZERO;
         BigDecimal rightAchieve = BigDecimal.ZERO;
 
@@ -781,13 +779,8 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             PlaceNewAddAchieveVO achieve = selectNewABAchieve(pna);
 
             if (null != achieve) {
-                if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                    leftAchieve = achieve.getLeftAchieve().multiply(currency.getData().getInExchangeRate());
-                    rightAchieve = achieve.getRightAchieve().multiply(currency.getData().getInExchangeRate());
-                } else {
-                    leftAchieve = achieve.getLeftAchieve();
-                    rightAchieve = achieve.getRightAchieve();
-                }
+                leftAchieve = achieve.getLeftAchieve();
+                rightAchieve = achieve.getRightAchieve();
             }
         }
 
@@ -915,9 +908,6 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             PlaceNewAddAchieveVO endParentAchieve = selectParentAchieve(pam);
             if (StringUtils.isNotNull(endParentAchieve)) {
                 rtupna.setDirectAchieve(endParentAchieve.getDirectAchieve());
-                if (SecurityUtils.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                    rtupna.setDirectAchieve(rtupna.getDirectAchieve().multiply(currency.getData().getInExchangeRate()));
-                }
                 if (rtupna.getDirectAchieve().compareTo(BigDecimal.ZERO) > 0) {
                     rtupna.setDirectAchieve(rtupna.getDirectAchieve().divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN));
                 } else {
@@ -932,15 +922,11 @@ public class CuMemberAchieveServiceImpl extends ServiceImpl<CuMemberAchieveMappe
             if (CollectionUtil.isNotEmpty(lrDirectAchieve)) {
                 for (PlaceNewAddAchieveVO pl : lrDirectAchieve) {
                     if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.LEFT_DEPT.getValue()) {
-                        if (pna.getPkCountry().equals(CountryConstants.CHINA_COUNTRY)) {
-                            leftDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
-                        } else {
-                            leftDirectAchieve = pl.getDirectAchieve();
-                        }
+                        leftDirectAchieve = pl.getDirectAchieve();
                         leftDirectAchieve = leftDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
                     }
                     if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
-                        rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
+                        rightDirectAchieve = pl.getDirectAchieve();
                         rightDirectAchieve = rightDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
                     }
                 }