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(), 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()));
+//        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()));
 
         // 先计算新增，根据新增计算碰次
         // 先进行初始化所有的安置人，存储需要修改的值,cuMemberSettleExtMap最终修改的
@@ -730,11 +730,6 @@ public class BonusSettlePurchaseHandle extends BonusSettleHandle {
             for (SaOrderExt saOrderExt : purchaseOrderList) {
                 // 来源会员
                 CuMemberSettleExt sourceMemberSettleExt = cuMemberSettleExtMap.get(saOrderExt.getPkMember());
-                // 处理会员复购业绩
-                sourceMemberSettleExt.setRepurchaseAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseAmount(), saOrderExt.getOrderAmount()));
-                sourceMemberSettleExt.setRepurchasePv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchasePv(), saOrderExt.getOrderAchieve()));
-                sourceMemberSettleExt.setRepurchaseNewAmount(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewAmount(), saOrderExt.getOrderAmount()));
-                sourceMemberSettleExt.setRepurchaseNewPv(ComputeUtil.computeAdd(sourceMemberSettleExt.getRepurchaseNewPv(), saOrderExt.getOrderAchieve()));
                 // 订单产生的见点收益
                 List<CuMemberBonusCoach> orderBonusCoachList = new ArrayList<>();
 

bd-business/bd-business-member/src/main/java/com/hzs/member/achieve/service/impl/CuMemberAchieveServiceImpl.java

@@ -765,6 +765,8 @@ 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;
 
@@ -779,10 +781,15 @@ 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();
                 }
             }
+        }
 
         if (leftAchieve.compareTo(BigDecimal.ZERO) > 0) {
             leftAchieve = leftAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
@@ -908,6 +915,9 @@ 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 {
@@ -922,11 +932,15 @@ 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 = leftDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
                     }
                     if (pl.getDirectAchieve() != null && pl.getPlaceDept() == EPlaceDept.RIGHT_DEPT.getValue()) {
-                        rightDirectAchieve = pl.getDirectAchieve();
+                        rightDirectAchieve = pl.getDirectAchieve().multiply(currency.getData().getInExchangeRate());
                         rightDirectAchieve = rightDirectAchieve.divide(MagicNumberConstants.big10000, 4, RoundingMode.DOWN);
                     }
                 }

bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/third/pay/ext/TOnlinePaymentExt.java

@@ -32,14 +32,6 @@ public class TOnlinePaymentExt extends TOnlinePayment {
 
     private Integer orderType;
     private String orderTypeVal;
-    /**
-     * 体系ID
-     */
-    private Integer vertexId;
-    /**
-     * 体系名称
-     */
-    private String vertexName;
 
     private Long rechargeId;
 

bd-third/src/main/java/com/hzs/third/pay/param/OnlinePaymentParam.java

@@ -71,5 +71,4 @@ public class OnlinePaymentParam {
      */
     private Integer orderType;
 
-    private Integer vertexId;
 }

bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePaymentVO.java

@@ -39,11 +39,7 @@ public class OnlinePaymentVO {
      */
     @Excel(name = "会员姓名")
     private String memberName;
-    /**
-     * 体系名称
-     */
-    @Excel(name = "体系名称")
-    private String vertexName;
+
     /**
      * 业务类型（1=直销订单,3=充值,4=抽奖）
      */

bd-third/src/main/resources/mapper/third/pay/TOnlinePaymentMapper.xml

@@ -31,20 +31,14 @@
     <!-- 查询列表 -->
     <select id="queryList" resultType="com.hzs.common.domain.third.pay.ext.TOnlinePaymentExt">
         select top.*, cm.member_code, cm.member_name,smr.Pk_id as rechargeId,
-        so.order_type orderType,
-        bv.VERTEX_NAME,
-        bv.pk_id VERTEX_id
+        so.order_type orderType
         from T_ONLINE_PAYMENT top
         left join cu_member cm
         on cm.pk_id = top.pk_creator
         left join sa_order so on so.ORDER_CODE = top.business_code
         left join cu_member_recharge smr on smr.RECHARGE_CODE = top.business_code
-        left join BD_VERTEX bv on bv.pk_id = cm.PK_VERTEX
         where top.del_flag = 0
         and top.pk_country = #{pkCountry}
-        <if test="param.vertexId != null">
-            and bv.pk_id = ${param.vertexId}
-        </if>
         <if test="param.memberCode != null and param.memberCode != ''">
             and cm.member_code like #{param.memberCode} || '%'
         </if>