From 1004f3d16011f69894196bfd180ea539b76ba4e7 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 03 Jun 2026 15:27:26 +0800
Subject: [PATCH] 1
---
trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java
index cebd32a..89009f7 100644
--- a/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java
+++ b/trading-order-admin/src/main/java/com/yami/trading/admin/controller/miner/MinerOrderController.java
@@ -115,15 +115,18 @@
data.put("cycle", data.get("cycle"));
data.put("all_rate", Arith.mul(minerTestProfit, Integer.valueOf(data.get("cycle").toString())));
} else {
- double dailyProfitRate = Arith.mul(Double.valueOf(data.get("daily_rate").toString()), 0.01d);
+ double displayDailyRate = data.get("show_daily_rate") != null
+ ? Double.valueOf(data.get("show_daily_rate").toString())
+ : Double.valueOf(data.get("daily_rate").toString());
+ double dailyProfitRate = Arith.mul(displayDailyRate, 0.01d);
double dailyProfitAmount = Arith.mul(dailyProfitRate, Double.valueOf(data.get("amount").toString()));
String dailyProfit = df.format(dailyProfitAmount);
// 当日收益
data.put("daily_profit", dailyProfit);
- data.put("daily_rate", data.get("daily_rate"));
+ data.put("daily_rate", displayDailyRate);
// 这里的周期，体验矿机是周期，其他矿机是解锁周期(到期后需手动解锁)
data.put("cycle", data.get("cycle_close"));
- double all_rate = Arith.mul(30, Double.valueOf(data.get("daily_rate").toString()));
+ double all_rate = Arith.mul(30, displayDailyRate);
data.put("all_rate", df.format(all_rate));
}
}
@@ -373,13 +376,15 @@
map.put("all_rate", Arith.mul(minerTestProfit, miner.getCycle()));
} else {
double amount = Double.valueOf(amount_temp);
+ double displayDailyRate = miner.getShow_daily_rate();
map.put("amount", amount);
map.put("stop_time", null);
- map.put("daily_rate", miner.getDaily_rate());
- double rate = Arith.mul(miner.getDaily_rate(), 0.01d);
+ map.put("daily_rate", displayDailyRate);
+ map.put("show_daily_rate", displayDailyRate);
+ double rate = Arith.mul(displayDailyRate, 0.01d);
map.put("profit_may", String.valueOf(df.format(Arith.mul(amount, Arith.mul(rate, 30d)))));
map.put("cycle", miner.getCycle_close());
- double all_rate = Arith.mul(30d, miner.getDaily_rate());
+ double all_rate = Arith.mul(30d, displayDailyRate);
map.put("all_rate", df.format(all_rate));
}
map.put("investment_min", miner.getInvestment_min());
@@ -480,7 +485,7 @@
map.put("miner_name_cn", miner.getName_cn());
Double miner_test_profit = sysparaService.find("miner_test_profit").getDouble();
- map.put("daily_rate", miner.getTest().equals("Y") ? miner_test_profit : miner.getDaily_rate());
+ map.put("daily_rate", miner.getTest().equals("Y") ? miner_test_profit : miner.getShow_daily_rate());
Date create_time = order.getCreate_time();
map.put("create_timeStr", create_time);
map.put("close_timeStr", order.getClose_time());
@@ -505,7 +510,8 @@
map.put("days", daysBetween);
int last_days = daysBetween(create_time, date_now);
map.put("can_close", last_days >= miner.getCycle_close());
- double rate = Arith.mul(miner.getDaily_rate(), 0.01d);
+ double displayDailyRate = miner.getShow_daily_rate();
+ double rate = Arith.mul(displayDailyRate, 0.01d);
map.put("profit_may", miner.getTest().equals("Y") ? String.valueOf(Arith.mul(miner_test_profit, miner.getCycle()))
: String.valueOf(Arith.mul(order.getAmount(), Arith.mul(rate, 30d))));
map.put("order_no", order.getOrder_no());
@@ -518,7 +524,7 @@
int cycle = miner.getTest().equals("Y") ? miner.getCycle() : miner.getCycle_close();
map.put("cycle", cycle);
- double all_rate = Arith.mul(30, miner.getDaily_rate());
+ double all_rate = Arith.mul(30, displayDailyRate);
map.put("all_rate", miner.getTest().equals("Y") ? Arith.mul(miner_test_profit, miner.getCycle()) : df.format(all_rate));
map.put("test", miner.getTest());
--
Gitblit v1.9.3