fix: 更改fund的有效期为50天
This commit is contained in:
@@ -251,7 +251,7 @@ module.exports = {
|
|||||||
]);
|
]);
|
||||||
// 计算昨日收益
|
// 计算昨日收益
|
||||||
let revenueLastday = calRevenueLastday(actions);
|
let revenueLastday = calRevenueLastday(actions);
|
||||||
// 筛选有效矿晶
|
// 筛选有效矿晶
|
||||||
let activeFund = getActiveFund(fund.fundList);
|
let activeFund = getActiveFund(fund.fundList);
|
||||||
return res.json({
|
return res.json({
|
||||||
code: 0,
|
code: 0,
|
||||||
@@ -259,9 +259,9 @@ module.exports = {
|
|||||||
data: {
|
data: {
|
||||||
list: newFund.fundList,
|
list: newFund.fundList,
|
||||||
basic: {
|
basic: {
|
||||||
activeFund,
|
activeFund, //有效矿晶
|
||||||
revenueLastday,
|
revenueLastday, // 昨日收益
|
||||||
revenueAll: newFund.asset['vic']
|
revenueAll: newFund.asset['vic'] // 累计总收益
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -14,30 +14,13 @@ class Fund {
|
|||||||
this.blockNumber = blockNumber;
|
this.blockNumber = blockNumber;
|
||||||
this.blockHash = hash;
|
this.blockHash = hash;
|
||||||
const now = new Date();
|
const now = new Date();
|
||||||
const exp = calExpirePeriod(amount);
|
const exp = calExpirePeriod();
|
||||||
this.createdAt = now.toISOString();
|
this.createdAt = now.toISOString();
|
||||||
this.expiresAt = new Date(now.getTime() + exp * DayLong);
|
this.expiresAt = new Date(now.getTime() + exp * DayLong);
|
||||||
|
this.releasedAmout = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const calExpirePeriod = amount => {
|
const calExpirePeriod = () => 50;
|
||||||
switch (true) {
|
|
||||||
case (amount >= 200 && amount <= 1999):
|
|
||||||
return 300;
|
|
||||||
case amount >= 2000 && amount <= 3999:
|
|
||||||
return 310;
|
|
||||||
case amount >=4000 && amount <=5999:
|
|
||||||
return 320;
|
|
||||||
case amount >= 6000 && amount <= 7999:
|
|
||||||
return 330;
|
|
||||||
case amount >= 8000 && amount <= 9999:
|
|
||||||
return 340;
|
|
||||||
case amount >= 10000 && amount <= 11999:
|
|
||||||
return 350;
|
|
||||||
case amount >= 12000:
|
|
||||||
return 365;
|
|
||||||
default: return 0;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
createNewFund (txData) {
|
createNewFund (txData) {
|
||||||
@@ -53,6 +36,7 @@ module.exports = {
|
|||||||
return revenueLastday;
|
return revenueLastday;
|
||||||
},
|
},
|
||||||
getActiveFund (fundList) {
|
getActiveFund (fundList) {
|
||||||
|
// fund里面的项目,status=1的就是正在挖的有效矿晶
|
||||||
let activeFund = 0;
|
let activeFund = 0;
|
||||||
for (let i = fundList.length; i >= 0; i--) {
|
for (let i = fundList.length; i >= 0; i--) {
|
||||||
const fundItem = fundList[i];
|
const fundItem = fundList[i];
|
||||||
|
|||||||
@@ -31,7 +31,9 @@ const FundSchema = new mongoose.Schema({
|
|||||||
type: Number,
|
type: Number,
|
||||||
default: 0
|
default: 0
|
||||||
},
|
},
|
||||||
// asset表示用户的财产,包括VIC/团队奖励的USDT
|
// asset表示用户的收益,包括VIC和团队奖励的USDT
|
||||||
|
// vic是挖矿得到的奖励
|
||||||
|
// usdt是社群奖励,后面加上了糖果,也代表糖果数量
|
||||||
asset: {
|
asset: {
|
||||||
type: {},
|
type: {},
|
||||||
default: {
|
default: {
|
||||||
|
|||||||
Reference in New Issue
Block a user