From 55bb9842cd09f595b37177b0b85055e96bb5f00a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 16:24:27 +0800
Subject: [PATCH] 更新bug修改
---
cloud-server-gateway/pom.xml | 2 +-
cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java | 5 +++++
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java | 2 +-
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 1 -
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index c234472..808b218 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -352,7 +352,6 @@
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
-
public synchronized ResultUtil paymentCompetition(PaymentCompetitionVo paymentCompetitionVo) {
try {
Competition byId = competitionService.getById(paymentCompetitionVo.getId());
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java b/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
index dc4c657..5d1b5b9 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/entity/UserCompetition.java
@@ -49,6 +49,11 @@
@TableField("participantId")
private Integer participantId;
/**
+ * 参与人员类型（1=学员，2=参赛者）
+ */
+ @TableField("participantType")
+ private Integer participantType;
+ /**
* 支付记录id
*/
@TableField("paymentCompetitionId")
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 81c645a..9b1b269 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
@@ -241,7 +241,6 @@
}
-// int competitionId = userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("competitionId", paymentCompetitionVo.getId()));
if ((competitionId + split.length) > competition.getApplicantsNumber()) {
return ResultUtil.error("报名人数超过最大限制");
}
@@ -290,6 +289,7 @@
userCompetition.setAppUserId(uid);
userCompetition.setCompetitionId(paymentCompetitionVo.getId());
userCompetition.setParticipantId(Integer.valueOf(s));
+// userCompetition.setParticipantType();
userCompetition.setPaymentCompetitionId(paymentCompetition.getId());
userCompetition.setInsertTime(new Date());
userCompetitionService.save(userCompetition);
diff --git a/cloud-server-gateway/pom.xml b/cloud-server-gateway/pom.xml
index 8172949..65e4004 100644
--- a/cloud-server-gateway/pom.xml
+++ b/cloud-server-gateway/pom.xml
@@ -11,7 +11,7 @@
<artifactId>mb-cloud-gateway</artifactId>
<packaging>jar</packaging>
- <name>网关</name>444
+ <name>网关</name>
<description>网关</description>
--
Gitblit v1.7.1