From a8e2e9ff1040e8668e992b97416eaad21132dae1 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 04 Dec 2024 22:35:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jys7-15' into jys7-15
---
src/main/java/project/miner/job/MinerOrderProfitServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/project/miner/job/MinerOrderProfitServiceImpl.java b/src/main/java/project/miner/job/MinerOrderProfitServiceImpl.java
index 7159dec..3a06f38 100644
--- a/src/main/java/project/miner/job/MinerOrderProfitServiceImpl.java
+++ b/src/main/java/project/miner/job/MinerOrderProfitServiceImpl.java
@@ -105,7 +105,8 @@
continue;
}
- if (miner.getTest() && systemTime.before(DateUtils.getDayStart(order.getEarn_time()))) {
+// if (miner.getTest() && systemTime.before(DateUtils.getDayStart(order.getEarn_time()))) {
+ if (miner.getTest() && systemTime.before(order.getEarn_time())) {
// 体验矿机，今天<起息日 不计息
continue;
}
@@ -175,7 +176,8 @@
continue;
}
- if (miner.getTest() && new Date().before(DateUtils.getDayStart(order.getEarn_time()))) {
+ if (miner.getTest() && new Date().before(order.getEarn_time())) {
+// if (miner.getTest() && new Date().before(DateUtils.getDayStart(order.getEarn_time()))) {
// 体验矿机，今天<起息日 不计息
continue;
}
--
Gitblit v1.9.3