From eb6b6dbb35a9f029e0b7d269773685c19fd40976 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期四, 11 七月 2024 10:47:51 +0800 Subject: [PATCH] 玩湃微信商户认证代码 --- cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 84 ++++++++++++++++++++++++----------------- 1 files changed, 49 insertions(+), 35 deletions(-) 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 3566d7d..57812c9 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 @@ -1,6 +1,7 @@ package com.dsh.competition.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsh.competition.entity.Participant; import com.dsh.competition.entity.UserCompetition; import com.dsh.competition.feignclient.account.AppUserClient; import com.dsh.competition.feignclient.account.StudentClient; @@ -13,8 +14,10 @@ import com.dsh.competition.model.SaveParticipant; import com.dsh.competition.service.IParticipantService; import com.dsh.competition.service.UserCompetitionService; +import com.dsh.competition.util.JuHeUtil; import com.dsh.competition.util.ResultUtil; import com.dsh.competition.util.TokenUtil; +import com.dsh.competition.util.ToolUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -41,28 +44,24 @@ private TokenUtil tokenUtil; - - @ResponseBody @PostMapping("/api/participant/addParticipant") @ApiOperation(value = "添加参赛人员", tags = {"APP-赛事活动列表", ""}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil addParticipant(AddParticipant addParticipant){ + public ResultUtil addParticipant(AddParticipant addParticipant) { try { Integer uid = tokenUtil.getUserIdFormRedis(); - if(null == uid){ + if (null == uid) { return ResultUtil.tokenErr(); } return participantService.addParticipant(uid, addParticipant); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResultUtil.runErr(); } } - - @ResponseBody @@ -72,14 +71,14 @@ @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") }) - public ResultUtil<List<ParticipantVo>> queryParticipantList(Integer isPre){ + public ResultUtil<List<ParticipantVo>> queryParticipantList(Integer isPre) { try { Integer uid = tokenUtil.getUserIdFormRedis(); - if(null == uid){ + if (null == uid) { return ResultUtil.tokenErr(); } List<ParticipantVo> participantVos = participantService.queryParticipantList(uid); - if (isPre!=null){ + if (isPre != null) { List<ParticipantVo> filteredParticipants = new ArrayList<>(); for (ParticipantVo participant : participantVos) { @@ -87,62 +86,76 @@ filteredParticipants.add(participant); } } - return ResultUtil.success(filteredParticipants); + return ResultUtil.success(filteredParticipants); } return ResultUtil.success(participantVos); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResultUtil.runErr(); } } - - - @Resource - private StudentClient studentClient; + @Resource + private StudentClient studentClient; @Resource private AppUserClient appUserClient; + @ResponseBody @PostMapping("/api/participant/editParticipant") @ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""}) @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil editParticipant(EditParticipant editParticipant){ + public ResultUtil editParticipant(EditParticipant editParticipant) { try { Integer uid = tokenUtil.getUserIdFormRedis(); - if(null == uid){ + if (null == uid) { return ResultUtil.tokenErr(); } int numDigits = String.valueOf(editParticipant.getId()).length(); - - if (numDigits==9){ - return participantService.editParticipant(uid, editParticipant); - } - else { + if (numDigits == 9) { + Participant byId = participantService.getById(editParticipant.getId()); + editParticipant.setName(byId.getName()); + return participantService.editParticipant(uid, editParticipant); + } else { TStudent student = new TStudent(); student.setId(editParticipant.getId()); - student.setName(editParticipant.getName()); + + TStudent student1 = studentClient.queryById(editParticipant.getId()); + student.setName(student1.getName()); student.setIdCard(editParticipant.getIdcard()); - student.setHeight(Double.valueOf(editParticipant.getHeight())); - student.setWeight(editParticipant.getWeight()); + if (editParticipant.getHeight() != null) { + student.setHeight(Double.valueOf(editParticipant.getHeight())); + } + + if (editParticipant.getWeight() != null) { + student.setWeight(editParticipant.getWeight()); + } + + if (ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) { + Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName()); + if (!aBoolean) { + return ResultUtil.error("身份证和姓名不匹配"); + } + } + + student.setPhone(editParticipant.getPhone()); studentClient.updateAppUser(student); return ResultUtil.success(); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResultUtil.runErr(); } } - @ResponseBody @@ -151,14 +164,14 @@ @ApiImplicitParams({ @ApiImplicitParam(name = "Authorization", value = "用户token(Bearer +token)", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....") }) - public ResultUtil delParticipant(Integer id){ + public ResultUtil delParticipant(Integer id) { try { Integer uid = tokenUtil.getUserIdFormRedis(); - if(null == uid){ + if (null == uid) { return ResultUtil.tokenErr(); } return participantService.delParticipant(id); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); return ResultUtil.runErr(); } @@ -167,14 +180,15 @@ /** * 保存学员后同步参赛人员信息 + * * @param saveParticipant */ @ResponseBody @PostMapping("/participant/saveParticipant") - public void saveParticipant(@RequestBody SaveParticipant saveParticipant){ + public void saveParticipant(@RequestBody SaveParticipant saveParticipant) { try { participantService.saveParticipant(saveParticipant); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -185,7 +199,7 @@ @ResponseBody @PostMapping("/participant/counts") - public Integer counts(@RequestBody Integer stuId){ - return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId",stuId)); + public Integer counts(@RequestBody Integer stuId) { + return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId", stuId)); } } -- Gitblit v1.7.1