From c5ac51a5525b261127845a38a1fec5a86c860441 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 14 May 2021 20:00:10 +0800
Subject: [PATCH] Merge branch 'yunding' of http://120.27.238.55:7000/r/exchange into yunding
---
src/test/java/com/xcong/excoin/XchTest.java | 2 +-
src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java | 6 +++---
src/main/resources/mapper/member/MemberDao.xml | 4 ++++
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 20 ++++++++++++++++++++
src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java | 2 ++
5 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java b/src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java
index dca43d1..80296a8 100644
--- a/src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java
+++ b/src/main/java/com/xcong/excoin/modules/blackchain/service/Trc20Service.java
@@ -26,9 +26,9 @@
private final static String FULL_NODE_URL = "https://api.trongrid.io";
- public final static String TRX_PRIVATE_KEY = "a3f6e445fb7e8b835f84431cc6f4ffc991745338d61d9b2ca1575b822563e1f4";
- public final static String TRX_ADDRESS = "TUEZxDjAKw6aCwQJVKX9RGWZUKDyzFkunA";
- public final static String POOL_ADDRESS = "TXeawtLhKDPYKFhET1MnHRMXYVKPo5ThxB";
+ public final static String TRX_PRIVATE_KEY = "1ddb52c1258dc9e5ba81a3763fd470a7cceca3de04948a82b3ce3c4546855952";
+ public final static String TRX_ADDRESS = "TYkLQnU5AX4XM14UJK7QvJT3kRwbHCqV3v";
+ public final static String POOL_ADDRESS = "TFFEzYUdddx9uuMbZcgBK7kDAsmS5hjA9t";
public final static String API_KEY="a7b0c96a-cfcd-474d-88c5-75c6277fedbf";
diff --git a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
index e73f0d2..da8fffa 100644
--- a/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
+++ b/src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java
@@ -31,4 +31,6 @@
List<MemberEntity> selectMemberByRefererId(@Param("refererId") String refererId);
List<MemberEntity> selectTeamAgentList(@Param("inviteId") String inviteId);
+
+ List<MemberEntity> selectPartnerMemberList();
}
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 e4422bd..3b8ef4d 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
@@ -10,9 +10,11 @@
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;
@@ -47,6 +49,9 @@
@Autowired
private YunDingProducter yunDingProducter;
+
+ @Autowired
+ private YdBasicSettingDao ydBasicSettingDao;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -177,6 +182,21 @@
updateOrder.setId(order.getId());
ydOrderDao.updateById(updateOrder);
}
+
+ 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);
+ }
+ }
+
}
private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {
diff --git a/src/main/resources/mapper/member/MemberDao.xml b/src/main/resources/mapper/member/MemberDao.xml
index 7c11538..838f835 100644
--- a/src/main/resources/mapper/member/MemberDao.xml
+++ b/src/main/resources/mapper/member/MemberDao.xml
@@ -87,4 +87,8 @@
where (find_in_set(#{inviteId}, a.referer_ids) or invite_id=#{inviteId})
and agent_level in (1, 2)
</select>
+
+ <select id="selectPartnerMemberList" resultType="com.xcong.excoin.modules.member.entity.MemberEntity">
+ select * from member where is_trader=1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index 30212bc..39bd254 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -60,7 +60,7 @@
@Test
public void orderUsdtProfitTest() {
- xchProfitService.usdtProfitDistributorByOrderId(7L);
+ xchProfitService.usdtProfitDistributorByOrderId(1L);
}
//
// @Autowired
--
Gitblit v1.9.1