From b8376677b0c6a1c537bbb7bc4bb730201b16dd61 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 24 May 2021 16:29:18 +0800
Subject: [PATCH] modify
---
src/test/java/com/xcong/excoin/XchTest.java | 8 ++++++--
src/main/java/com/xcong/excoin/modules/yunding/service/Impl/XchProfitServiceImpl.java | 24 ++++++++++++++++++++----
src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java | 2 ++
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java
index 9988856..d2f82c9 100644
--- a/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java
+++ b/src/main/java/com/xcong/excoin/modules/yunding/entity/YdBasicLevelSettingEntity.java
@@ -27,4 +27,6 @@
private BigDecimal salePrice;
private Integer level;
+
+ private String unit;
}
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 ea55732..ad88844 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
@@ -110,7 +110,12 @@
}
}
- BigDecimal needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
+ BigDecimal needPower = BigDecimal.ZERO;
+ if ("P".equals(basicLevelSetting.getUnit())) {
+ needPower = basicLevelSetting.getCalculationPower().multiply(BigDecimal.valueOf(1024));
+ } else {
+ needPower = basicLevelSetting.getCalculationPower();
+ }
return totalPower.compareTo(needPower) > 0;
}
@@ -217,6 +222,7 @@
private Map<Long, BigDecimal> buildReturnRatioObj(List<MemberEntity> agents, int type) {
Map<Long, BigDecimal> returnRatio = new HashMap<Long, BigDecimal>();
Long lastId = null;
+ int i = 0;
for (MemberEntity agent : agents) {
YdBasicLevelSettingEntity settingEntity = agent.getYdBasicLevelSettingEntity();
@@ -228,12 +234,20 @@
}
if(settingEntity.getLevel() == 1) {
if (CollUtil.isNotEmpty(returnRatio)) {
- BigDecimal lastRatio = returnRatio.get(lastId);
- returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
+ if (i != 0) {
+ returnRatio.put(agent.getId(), BigDecimal.valueOf(0.01));
+ } else {
+ BigDecimal lastRatio = returnRatio.get(lastId);
+ returnRatio.put(agent.getId(), ratio.subtract(lastRatio));
+ }
} else {
returnRatio.put(agent.getId(), ratio);
}
- break;
+
+ if (i >= 1) {
+ break;
+ }
+ i++;
}
if (CollUtil.isEmpty(returnRatio)) {
@@ -281,6 +295,8 @@
if ("P".equals(order.getYdProductEntity().getProUnit())) {
count = count.multiply(BigDecimal.valueOf(1024));
}
+
+ // 订单总收益
BigDecimal orderProfit = count.multiply(unitProfit);
BigDecimal remainProfit = orderProfit;
if (CollUtil.isNotEmpty(agents)) {
diff --git a/src/test/java/com/xcong/excoin/XchTest.java b/src/test/java/com/xcong/excoin/XchTest.java
index a0244e6..919737c 100644
--- a/src/test/java/com/xcong/excoin/XchTest.java
+++ b/src/test/java/com/xcong/excoin/XchTest.java
@@ -5,6 +5,7 @@
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.http.HttpRequest;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.xcong.excoin.modules.coin.parameter.dto.CoinInListDto;
import com.xcong.excoin.modules.coin.service.CoinService;
@@ -102,8 +103,11 @@
}
public static void main(String[] args) {
- String s = execCurl("https://api2.chiaexplorer.com/blockchainSummary");
- System.out.println(s);
+// String s = execCurl("https://api2.chiaexplorer.com/blockchainSummary");
+// System.out.println(s);
+
+ String body = HttpRequest.get("https://api2.chiaexplorer.com/blockchainSummary").execute().body();
+ System.out.println(body);
}
private static String execCurl(String url) {
--
Gitblit v1.9.1