From 7e312fda9048ef171ff146acf6c8c679d123d357 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 15:17:48 +0800
Subject: [PATCH] 后台代码
---
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 2 +-
cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java | 2 +-
cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml | 5 ++---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 2 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 2 +-
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 1 +
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java b/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
index f61e03e..7d067ff 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/model/AddParticipant.java
@@ -21,7 +21,7 @@
@ApiModelProperty(value = "性别（1=男，2=女）", dataType = "int", required = true)
private Integer gender;
@ApiModelProperty(value = "身高（CM）", dataType = "int", required = true)
- private Integer height;
+ private String height;
@ApiModelProperty(value = "体重（KG）", dataType = "double", required = true)
private Double weight;
@ApiModelProperty(value = "联系电话", dataType = "string", required = false)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index 61ba100..deffefa 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -63,6 +63,7 @@
Participant participant = new Participant();
BeanUtils.copyProperties(addParticipant, participant);
+ participant.setHeight(Double.valueOf(addParticipant.getHeight()).intValue());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if(ToolUtil.isNotEmpty(addParticipant.getBirthday())){
Date parse = sdf.parse(addParticipant.getBirthday());
diff --git a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
index a21f30f..61bb70a 100644
--- a/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
+++ b/cloud-server-competition/src/main/resources/mapper/CompetitionMapper.xml
@@ -13,9 +13,8 @@
a.registerCondition,
a.introduction,
DATE_FORMAT(a.registerEndTime, '%Y-%m-%d %H:%i') as registerEndTime,
- CONCAT(a.startAge, '-', a.endAge) as age,
-
- (a.baseNumber + a.applicantsNumber) as heat
+ CONCAT(a.startAge, '-', a.endAge) as `age`,
+ (a.baseNumber + a.applicantsNumber) as `heat`
from t_competition a
where a.auditStatus = 2 and a.`status` = 2 and a.state = 1
<if test="null != cityCode and '' != cityCode">
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index fc8808c..25393f0 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -529,7 +529,7 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(name = "coursePayId" ,value = "课包记录id",dataType = "long"),
})
- public ResultUtil<CourseDetailsResponse> getRegisteredData( Integer coursePayId){
+ public ResultUtil<CourseDetailsResponse> getRegisteredData(Long coursePayId){
try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if(null == appUserId){
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
index 763ec2b..13ebdf2 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
@@ -72,7 +72,7 @@
* @param appUserId
* @return
*/
- CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePayId, Integer appUserId);
+ CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index ffeb2c7..337a5c9 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -245,7 +245,7 @@
}
@Override
- public CourseDetailsResponse queryRegisteredCourseDetails(Integer coursePayId, Integer appUserId) {
+ public CourseDetailsResponse queryRegisteredCourseDetails(Long coursePayId, Integer appUserId) {
CourseDetailsResponse response = new CourseDetailsResponse();
TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
--
Gitblit v1.7.1