From d5b547aa7aef17e698a4062808023e085df4b32f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 10 三月 2025 14:02:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
index 54ef1fc..419ea78 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java
@@ -681,16 +681,18 @@
public void moneyOut() throws AlipayApiException {
Date date = new Date();
List<Competition> list = competitionService.list(new QueryWrapper<Competition>().lt("endTime",date).ne("isOut",1));
- List<Integer> coms = new ArrayList<>();
- for (Competition competition : list) {
- coms.add(competition.getId());
- competition.setIsOut(1);
+ if(list.size() > 0){
+ List<Integer> coms = new ArrayList<>();
+ for (Competition competition : list) {
+ coms.add(competition.getId());
+ competition.setIsOut(1);
+ }
+ List<PaymentCompetition> pays = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().in("competitionId", coms));
+ for (PaymentCompetition pay : pays) {
+ moneyOut(pay.getPayOrderNo(),pay.getPayOrderNo(),pay.getCode());
+ }
+ competitionService.updateBatchById(list);
}
- List<PaymentCompetition> pays = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>().in("competitionId", coms));
- for (PaymentCompetition pay : pays) {
- moneyOut(pay.getPayOrderNo(),pay.getPayOrderNo(),pay.getCode());
- }
- competitionService.updateBatchById(list);
}
--
Gitblit v1.7.1