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-activity/src/main/resources/sharding-jdbc.properties | 30 +++++++++++++++---------------
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 9 +--------
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 20 +++++++++++---------
cloud-server-competition/src/main/resources/logback-spring.xml | 1 -
4 files changed, 27 insertions(+), 33 deletions(-)
diff --git a/cloud-server-activity/src/main/resources/sharding-jdbc.properties b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
index 7f8645e..a8273e2 100644
--- a/cloud-server-activity/src/main/resources/sharding-jdbc.properties
+++ b/cloud-server-activity/src/main/resources/sharding-jdbc.properties
@@ -1,22 +1,9 @@
-#datasource.names=master0
-#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
-#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-#datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-#datasource.master0.username=root
-#datasource.master0.password=123456
-#datasource.master0.maxActive=20
-#datasource.master0.maxWait=60000
-#datasource.master0.minIdle=5
-#datasource.master0.initialSize=2
-
-
-
datasource.names=master0
datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
-datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+datasource.master0.url=jdbc:mysql://192.168.110.80:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
datasource.master0.username=root
-datasource.master0.password=playpai2023!
+datasource.master0.password=123456
datasource.master0.maxActive=20
datasource.master0.maxWait=60000
datasource.master0.minIdle=5
@@ -24,4 +11,17 @@
+#datasource.names=master0
+#datasource.master0.type=com.alibaba.druid.pool.DruidDataSource
+#datasource.master0.driverClassName=com.mysql.cj.jdbc.Driver
+#datasource.master0.url=jdbc:mysql://127.0.0.1:3306/playpai_activity?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+#datasource.master0.username=root
+#datasource.master0.password=playpai2023!
+#datasource.master0.maxActive=20
+#datasource.master0.maxWait=60000
+#datasource.master0.minIdle=5
+#datasource.master0.initialSize=2
+
+
+
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index 95e7551..b91139e 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -120,16 +120,11 @@
if (null == uid) {
return ResultUtil.tokenErr();
}
- int numDigits = String.valueOf(editParticipant.getId()).length();
-
-
- if (numDigits == 9) {
+ if (null != editParticipant.getIsStudent() && 0 == editParticipant.getIsStudent()) {
Participant byId = participantService.getById(editParticipant.getId());
editParticipant.setName(byId.getName());
return participantService.editParticipant(uid, editParticipant);
} else {
-
-
TStudent student = new TStudent();
student.setId(editParticipant.getId());
@@ -149,8 +144,6 @@
return ResultUtil.error("身份证和姓名不匹配");
}
}
-
-
student.setPhone(editParticipant.getPhone());
studentClient.updateAppUser(student);
return ResultUtil.success();
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);
}
diff --git a/cloud-server-competition/src/main/resources/logback-spring.xml b/cloud-server-competition/src/main/resources/logback-spring.xml
index ac1b3df..9eb0325 100644
--- a/cloud-server-competition/src/main/resources/logback-spring.xml
+++ b/cloud-server-competition/src/main/resources/logback-spring.xml
@@ -217,7 +217,6 @@
<springProfile name="prod">
<root level="info">
<!-- 生产环境最好不配置console写文件 -->
- <appender-ref ref="DEBUG_FILE"/>
<appender-ref ref="INFO_FILE"/>
<appender-ref ref="WARN_FILE"/>
<appender-ref ref="ERROR_FILE"/>
--
Gitblit v1.7.1