From e0046ec2c7c5e2d557143508bf7999324613fc5d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 01 Mar 2022 16:59:24 +0800
Subject: [PATCH] Merge branch 'bea' of http://120.27.238.55:7000/r/exchange into bea
---
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
index fa81e53..fbb1d90 100644
--- a/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java
@@ -150,7 +150,7 @@
memberWalletCoinlist.add(coin);
// coin.setWalletCode(CoinTypeEnum.GUSD.toString());
// memberWalletCoinlist.add(coin);
- coin.setWalletCode(CoinTypeEnum.GOLDRICE.toString());
+ coin.setWalletCode(CoinTypeEnum.GRICE.toString());
memberWalletCoinlist.add(coin);
MemberWalletCoinVo memberWalletCoinVo = new MemberWalletCoinVo();
@@ -774,6 +774,9 @@
// zhiYaRecord.setEffectDate(newDate);
// zhiYaRecordDao.updateById(zhiYaRecord);
// }
+ //更新团队算力表
+ //只计算直属团队的算力信息
+
return Result.ok(MessageSourceUtils.getString("member_service_0024"));
}
@@ -864,7 +867,7 @@
@Override
@Transactional
public void grantZhiyaAmount() {
- //获取每日总奖励
+ //获取每日总产出
BigDecimal gusdReward = new BigDecimal(redisUtils.getString("GUSDREWARD"));
//获取每日质押总数
Long totalGusd = zhiYaRecordDao.selectTotalGusdByStatueAndTime(1,new Date());
@@ -884,6 +887,10 @@
zhiyaRewardEntity.setMemberId(zhiYaRecordEntity.getMemberId());
zhiyaRewardEntity.setRewardAmout(divide.multiply(zhiYaRecordEntity.getZhiyaCnt()));
zhiyaRewardDao.insert(zhiyaRewardEntity);
+
+ //给团队上级发送奖励goldrice
+ //给账户的冻结
+
}
}
}
--
Gitblit v1.9.1