From 0b10fd71ce7a6c32b70eef96f0ceb5a516306d6b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 15:05:01 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
index 1796454..ea55732 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java
@@ -4,18 +4,22 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
+import com.xcong.excoin.common.contants.AppContants;
import com.xcong.excoin.modules.coin.dao.MemberAccountMoneyChangeDao;
import com.xcong.excoin.modules.member.dao.MemberDao;
import com.xcong.excoin.modules.member.dao.MemberWalletCoinDao;
import com.xcong.excoin.modules.member.entity.MemberEntity;
import com.xcong.excoin.modules.member.entity.MemberWalletCoinEntity;
import com.xcong.excoin.modules.yunding.dao.YdBasicLevelSettingDao;
+import com.xcong.excoin.modules.yunding.dao.YdBasicSettingDao;
import com.xcong.excoin.modules.yunding.dao.YdOrderDao;
import com.xcong.excoin.modules.yunding.dao.YdProductDao;
import com.xcong.excoin.modules.yunding.entity.YdBasicLevelSettingEntity;
+import com.xcong.excoin.modules.yunding.entity.YdBasicSettingEntity;
import com.xcong.excoin.modules.yunding.entity.YdOrderEntity;
import com.xcong.excoin.modules.yunding.entity.YdProductEntity;
import com.xcong.excoin.modules.yunding.service.XchProfitService;
+import com.xcong.excoin.netty.common.Contans;
import com.xcong.excoin.rabbit.producer.YunDingProducter;
import com.xcong.excoin.utils.LogRecordUtils;
import lombok.extern.slf4j.Slf4j;
@@ -47,6 +51,9 @@
@Autowired
private YunDingProducter yunDingProducter;
+
+ @Autowired
+ private YdBasicSettingDao ydBasicSettingDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -160,22 +167,50 @@
List<String> inviteIds = StrUtil.split(memberEntity.getRefererIds(), ',');
List<MemberEntity> agents = memberDao.selectYdParentAgent(inviteIds);
- if (CollUtil.isNotEmpty(agents)) {
- Map<Long, BigDecimal> returnRatio = buildReturnRatioObj(agents, 1);
+// if (CollUtil.isNotEmpty(agents)) {
+// Map<Long, BigDecimal> returnRatio = buildReturnRatioObj(agents, 1);
+//
+// for (Map.Entry<Long, BigDecimal> entry : returnRatio.entrySet()) {
+// String conent = "USDT返利";
+// BigDecimal amount = order.getAmount().multiply(entry.getValue());
+// LogRecordUtils.insertMemberAccountMoneyChangeWithId(entry.getKey(), conent, amount, "USDT", 1, 6, order.getId());
+// MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(entry.getKey(), "USDT");
+//
+// memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), amount, BigDecimal.ZERO, 0);
+// }
+//
+// YdOrderEntity updateOrder = new YdOrderEntity();
+// updateOrder.setReturnState(2);
+// updateOrder.setId(order.getId());
+// ydOrderDao.updateById(updateOrder);
+// }
- for (Map.Entry<Long, BigDecimal> entry : returnRatio.entrySet()) {
- String conent = "USDT返利";
- BigDecimal amount = order.getAmount().multiply(entry.getValue());
- LogRecordUtils.insertMemberAccountMoneyChangeWithId(entry.getKey(), conent, amount, "USDT", 1, 6, order.getId());
- MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(entry.getKey(), "USDT");
-
- memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), amount, BigDecimal.ZERO, 0);
+ // 合伙人分红
+ List<MemberEntity> partners = memberDao.selectPartnerMemberList();
+ YdBasicSettingEntity setting = ydBasicSettingDao.selectById(1L);
+ if (CollUtil.isNotEmpty(partners)) {
+ BigDecimal returnAmount = order.getAmount().multiply(setting.getPartnerRatio()).divide(BigDecimal.valueOf(partners.size()), 8, BigDecimal.ROUND_DOWN);
+ log.info("合伙人分红:{}", returnAmount);
+ for (MemberEntity partner : partners) {
+ String conent = "合伙人USDT分红";
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(partner.getId(), conent, returnAmount, "USDT", 1, 9, order.getId());
+// MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(partner.getId(), "USDT");
+// memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), returnAmount, BigDecimal.ZERO, 0);
}
+ }
- YdOrderEntity updateOrder = new YdOrderEntity();
- updateOrder.setReturnState(2);
- updateOrder.setId(order.getId());
- ydOrderDao.updateById(updateOrder);
+ if(!AppContants.SYSTEM_REFERER.equals(memberEntity.getRefererId())) {
+ // 直推返利
+ MemberEntity parentNode = memberDao.selectMemberInfoByInviteId(memberEntity.getRefererId());
+ if (parentNode != null) {
+ BigDecimal parentAmount = order.getAmount().multiply(setting.getParentRatio());
+
+ String conent = "直推USDT返利";
+ LogRecordUtils.insertMemberAccountMoneyChangeWithId(parentNode.getId(), conent, parentAmount, "USDT", 1, 10, order.getId());
+ MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(parentNode.getId(), "USDT");
+
+ memberWalletCoinDao.updateBlockBalance(walletCoin.getId(), parentAmount, BigDecimal.ZERO, 0);
+ }
}
}
@@ -263,7 +298,7 @@
}
}
- remainProfit = remainProfit.subtract(orderProfit.subtract(orderProfit.multiply(order.getYdProductEntity().getManageExpense())));
+ remainProfit = remainProfit.subtract(orderProfit.multiply(order.getYdProductEntity().getManageExpense()));
String content = "XCH收益";
LogRecordUtils.insertMemberAccountMoneyChangeWithId(order.getMemberId(), content, remainProfit, "XCH", 1, 4, order.getId());
MemberWalletCoinEntity walletCoin = memberWalletCoinDao.selectWalletCoinBymIdAndCode(order.getMemberId(), "XCH");
--
Gitblit v1.9.1