From 517a089be40aebad647c316ee0d026d32807f87b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 08 二月 2024 17:12:47 +0800
Subject: [PATCH] 新增加接口
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 2
cloud-server-account/src/main/java/com/dsh/account/mapper/RefereeMapper.java | 12 ++++
cloud-server-account/src/main/java/com/dsh/account/service/impl/RefereeServiceImpl.java | 15 +++++
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IndexOfUserBenefirVo.java | 3 +
cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java | 8 ++
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 24 ++++---
cloud-server-account/src/main/java/com/dsh/account/entity/Referee.java | 64 +++++++++++++++++++++
cloud-server-account/src/main/resources/mapper/RefereeMapper.xml | 5 +
cloud-server-account/src/main/java/com/dsh/account/service/IRefereeService.java | 11 +++
9 files changed, 131 insertions(+), 13 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 46b5255..88665d2 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -59,7 +59,7 @@
@ResponseBody
@PostMapping("/api/useBenefit/indexOfAppUser")
- @ApiOperation(value = "福利主页", tags = {"APP-使用福利"})
+ @ApiOperation(value = "福利主页【2.0】", tags = {"APP-使用福利"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(name = "lat", value = "经度", dataType = "string"),
diff --git a/cloud-server-account/src/main/java/com/dsh/account/entity/Referee.java b/cloud-server-account/src/main/java/com/dsh/account/entity/Referee.java
new file mode 100644
index 0000000..c6eceb0
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/entity/Referee.java
@@ -0,0 +1,64 @@
+package com.dsh.account.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 裁判
+ * @author 39373
+ * @Date 2024/2/8 14:57
+ */
+@Data
+@TableName("t_referee")
+public class Referee {
+ /**
+ * 主键
+ */
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+ /**
+ * 姓名
+ */
+ @TableField("name")
+ private String name;
+ /**
+ * 手机号
+ */
+ @TableField("phone")
+ private String phone;
+ /**
+ * 省名称
+ */
+ @TableField("province")
+ private String province;
+ /**
+ * 省编号
+ */
+ @TableField("provinceCode")
+ private String provinceCode;
+ /**
+ * 市名称
+ */
+ @TableField("city")
+ private String city;
+ /**
+ * 市编号
+ */
+ @TableField("cityCode")
+ private String cityCode;
+ /**
+ * 状态（1=正常，2=冻结，3=删除）
+ */
+ @TableField("state")
+ private Integer state;
+ /**
+ * 添加时间
+ */
+ @TableField("createTime")
+ private Date createTime;
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/mapper/RefereeMapper.java b/cloud-server-account/src/main/java/com/dsh/account/mapper/RefereeMapper.java
new file mode 100644
index 0000000..9243fb3
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/mapper/RefereeMapper.java
@@ -0,0 +1,12 @@
+package com.dsh.account.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsh.account.entity.Referee;
+
+/**
+ * 裁判
+ * @author 39373
+ * @Date 2024/2/8 15:02
+ */
+public interface RefereeMapper extends BaseMapper<Referee> {
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IndexOfUserBenefirVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IndexOfUserBenefirVo.java
index 191c25e..b05b4d6 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IndexOfUserBenefirVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/IndexOfUserBenefirVo.java
@@ -31,4 +31,7 @@
@ApiModelProperty(value = "banners")
private UserBenefitImage image;
+ @ApiModelProperty("是否是裁判（0=否，1=是）")
+ private Integer referee;
+
}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/IRefereeService.java b/cloud-server-account/src/main/java/com/dsh/account/service/IRefereeService.java
new file mode 100644
index 0000000..1847096
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/IRefereeService.java
@@ -0,0 +1,11 @@
+package com.dsh.account.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsh.account.entity.Referee;
+
+/**
+ * @author 39373
+ * @Date 2024/2/8 15:03
+ */
+public interface IRefereeService extends IService<Referee> {
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/RefereeServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RefereeServiceImpl.java
new file mode 100644
index 0000000..7e3a460
--- /dev/null
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/RefereeServiceImpl.java
@@ -0,0 +1,15 @@
+package com.dsh.account.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsh.account.entity.Referee;
+import com.dsh.account.mapper.RefereeMapper;
+import com.dsh.account.service.IRefereeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author 39373
+ * @Date 2024/2/8 15:04
+ */
+@Service
+public class RefereeServiceImpl extends ServiceImpl<RefereeMapper, Referee> implements IRefereeService {
+}
diff --git a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
index 979be10..5b053b4 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -45,6 +45,7 @@
import com.dsh.account.model.vo.classDetails.RegisteredCourse;
import com.dsh.account.model.vo.classDetails.classInsVo.ClassInfoVo;
import com.dsh.account.model.vo.userBenefitDetail.*;
+import com.dsh.account.service.IRefereeService;
import com.dsh.account.service.TAppGiftService;
import com.dsh.account.service.TAppUserService;
import com.dsh.account.util.*;
@@ -116,7 +117,6 @@
@Resource
private ImgConfigClient icfgClient;
-
@Resource
private VideoOfCourseListClient voclClient;
@@ -177,6 +177,9 @@
@Resource
private UserCouponPaymentClient userCouponPaymentClient;
+
+ @Autowired
+ private IRefereeService refereeService;
@@ -753,7 +756,6 @@
@Override
public IndexOfUserBenefirVo queryBenefitDetails(Integer appUserId, String lon, String lat) {
IndexOfUserBenefirVo benefirVo = new IndexOfUserBenefirVo();
-
TAppUser appUser = this.getById(appUserId);
if (appUser.getHeadImg() != null) {
benefirVo.setUserHeadImg(appUser.getHeadImg());
@@ -775,6 +777,8 @@
List<IntegralCommodity> convertibleGoods = mcClient.getConvertibleGoods(location);
benefirVo.setCommodities(convertibleGoods);
benefirVo.setImage(icfgClient.getImageConfig());
+ Referee referee = refereeService.getOne(new QueryWrapper<Referee>().eq("phone", appUser.getPhone()).eq("state", 1));
+ benefirVo.setReferee(null == referee ? 0 : 1);
return benefirVo;
}
diff --git a/cloud-server-account/src/main/resources/mapper/RefereeMapper.xml b/cloud-server-account/src/main/resources/mapper/RefereeMapper.xml
new file mode 100644
index 0000000..23dde49
--- /dev/null
+++ b/cloud-server-account/src/main/resources/mapper/RefereeMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsh.account.mapper.RefereeMapper">
+
+</mapper>
\ No newline at end of file
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 39b2e65..a2371bb 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
@@ -43,10 +43,19 @@
@Autowired
private TokenUtil tokenUtil;
+ @Resource
+ private StudentClient studentClient;
+
+ @Autowired
+ private UserCompetitionService userCompetitionService;
+
+
+
+
@ResponseBody
@PostMapping("/api/participant/addParticipant")
- @ApiOperation(value = "添加参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "添加参赛人员【2.0】", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -66,7 +75,7 @@
@ResponseBody
@PostMapping("/api/participant/queryParticipantList")
- @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", "我的二维码", "人员管理"})
+ @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", "我的二维码", "人员管理", "社区世界杯"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
@ApiImplicitParam(value = "isPre(1过滤)", name = "是否过滤未实名", required = true, dataType = "int")
@@ -97,15 +106,11 @@
}
- @Resource
- private StudentClient studentClient;
- @Resource
- private AppUserClient appUserClient;
@ResponseBody
@PostMapping("/api/participant/editParticipant")
- @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -160,7 +165,7 @@
@ResponseBody
@PostMapping("/api/participant/delParticipant")
- @ApiOperation(value = "删除参赛人员", tags = {"APP-赛事活动列表", ""})
+ @ApiOperation(value = "删除参赛人员", tags = {"APP-赛事活动列表", "人员管理"})
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
@@ -193,8 +198,7 @@
}
}
- @Autowired
- private UserCompetitionService userCompetitionService;
+
@ResponseBody
--
Gitblit v1.7.1