lizixuan/cloud_hash_backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 支付测试代码删除

Browse Source
This commit is contained in:
yyb
2026-01-07 17:32:44 +08:00
parent db8384f04b
commit 7f6eb44cfe
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/main/java/com/m2pool/lease/task/OrderAndPayTask.java
View File

@@ -31,7 +31,9 @@ import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.Duration;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -138,14 +140,13 @@ public class OrderAndPayTask {
}
@Scheduled(cron = "0 0/1 * * * ? ")
@Scheduled(cron = "0 0/30 * * * ? ")
@Async("scheduledTaskExecutor")
@DSTransactional
public void paymentTaskV2(){
System.out.println("支付开始"+LocalDateTime.now());
Date now = DateUtils.getPreviousHalfHourOrFullHour(new Date());
//开发环境
LocalDateTime now1 = LocalDateTime.now();
//1.查找在进行中的订单
List<LeaseOrderInfo> needPayOrderList = leaseOrderInfoMapper.getNeedPayOrderList();
@@ -300,12 +301,12 @@ public class OrderAndPayTask {
for (LeaseOrderItem orderTimeInfoDto : oneDayApartOrder) {
orderCompleteMap.putIfAbsent(orderTimeInfoDto.getOrderId(), true);
// 计算订单结束时间（startTime + leaseTime天）
//LocalDateTime endTime = orderTimeInfoDto.getCreateTime().plusDays(orderTimeInfoDto.getLeaseTime());
LocalDateTime endTime = orderTimeInfoDto.getCreateTime().plusDays(orderTimeInfoDto.getLeaseTime());
//TODO 开发环境测试用1分钟当一天 差值改为差1分钟
LocalDateTime endTime = orderTimeInfoDto.getCreateTime().plusMinutes(orderTimeInfoDto.getLeaseTime() );
// 获取订单完成的订单详情:比较 now 和 endTime 的年月日时分秒差值是否小于30分
if (Duration.between(now, endTime).toMinutes() <= 1) {
// 开发环境 测试用1分钟当一天 差值改为差1分钟
//LocalDateTime endTime = orderTimeInfoDto.getCreateTime().plusMinutes(orderTimeInfoDto.getLeaseTime());
// 获取订单完成的订单详情:比较 now 和 endTime 的年月日时分秒差值是否小于30分
if (Duration.between(now, endTime).toMinutes() <= 30) {
completeMachines.add(LeaseMachine.builder()
.id(orderTimeInfoDto.getProductMachineId())
.canSaleNumbers(orderTimeInfoDto.getNumbers())
@@ -318,19 +319,19 @@ public class OrderAndPayTask {
continue;
}
// 获取本次定时任务需要支付的订单:当前时间和订单创建时间日期不同,比较当前时间的时分秒与订单创建时间的时分秒差值是否小于30分钟
//LocalTime nowTime = now.toLocalTime();
//LocalTime startTime = orderTimeInfoDto.getCreateTime().toLocalTime();
//LocalDate nowDate = now.toLocalDate();
//LocalDate startDate = orderTimeInfoDto.getCreateTime().toLocalDate();
//
//if (!nowDate.equals(startDate) && Duration.between(startTime, nowTime).toMinutes() <= 30) {
// needPayIds.add(orderTimeInfoDto.getId());
// needPayInfos.add(orderTimeInfoDto);
//}
LocalTime nowTime = now.toLocalTime();
LocalTime startTime = orderTimeInfoDto.getCreateTime().toLocalTime();
LocalDate nowDate = now.toLocalDate();
LocalDate startDate = orderTimeInfoDto.getCreateTime().toLocalDate();
//开发环境
if (!nowDate.equals(startDate) && Duration.between(startTime, nowTime).toMinutes() <= 30) {
needPayIds.add(orderTimeInfoDto.getId());
needPayInfos.add(orderTimeInfoDto);
}
//开发环境
// needPayIds.add(orderTimeInfoDto.getId());
// needPayInfos.add(orderTimeInfoDto);
//记录某个订单下所有子项目是否都完成
orderCompleteMap.put(orderTimeInfoDto.getOrderId(), false);
}