From a78b46f99137eadbcbe1f0720a00ba5e8d53b741 Mon Sep 17 00:00:00 2001 From: "382696293@qq.com" <382696293@qq.com> Date: Mon, 18 Dec 2023 15:02:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserMemberController.java | 15 +++- .../domain/vo/UserMemberUpdateVo.java | 79 +++++++++++++++++-- 2 files changed, 87 insertions(+), 7 deletions(-) diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java index c21f86d..45713fc 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/controller/UserMemberController.java @@ -1,12 +1,17 @@ package com.flossom.miniProgram.controller; +import com.flossom.common.core.utils.StringUtils; import com.flossom.common.core.web.controller.BaseController; import com.flossom.common.core.web.domain.AjaxResult; import com.flossom.miniProgram.domain.vo.UserMemberUpdateVo; import com.flossom.miniProgram.service.IWxUserMemberService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + @RestController @RequestMapping("/user") public class UserMemberController extends BaseController { @@ -23,6 +28,10 @@ public class UserMemberController extends BaseController { */ @PostMapping("/login") public AjaxResult login(@RequestParam(value = "code") String code) throws Exception { + if (StringUtils.isBlank(code)) { + logger.error("登录code不能为空"); + return AjaxResult.error("登录失败"); + } return AjaxResult.success(wxUserMemberService.login(code)); } @@ -36,6 +45,10 @@ public class UserMemberController extends BaseController { */ @PostMapping("/upgradeMember") public AjaxResult upgradeMember(@RequestParam(value = "code") String code) throws Exception { + if (StringUtils.isBlank(code)) { + logger.error("获取手机号code不能为空"); + return AjaxResult.error("获取手机号失败"); + } return AjaxResult.success("获取成功", wxUserMemberService.upgradeMember(code)); } @@ -45,7 +58,7 @@ public class UserMemberController extends BaseController { * @return */ @PostMapping("/updateUser") - public AjaxResult updateUser(@RequestBody UserMemberUpdateVo userMemberUpdateVo) { + public AjaxResult updateUser(@RequestBody @Validated UserMemberUpdateVo userMemberUpdateVo) { wxUserMemberService.updateUser(userMemberUpdateVo); return AjaxResult.success(); } diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/UserMemberUpdateVo.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/UserMemberUpdateVo.java index 7c2efd1..c084660 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/UserMemberUpdateVo.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/domain/vo/UserMemberUpdateVo.java @@ -1,8 +1,10 @@ package com.flossom.miniProgram.domain.vo; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.flossom.common.core.annotation.Excel; +import org.hibernate.validator.constraints.Length; +import org.springframework.format.annotation.DateTimeFormat; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; import java.util.Date; public class UserMemberUpdateVo { @@ -10,6 +12,8 @@ public class UserMemberUpdateVo { /** * 昵称 */ + @NotNull(message = "昵称不能为空") + @Size(min = 1, max = 20, message = "昵称长度需要控制在20位以内") private String nickname; /** @@ -20,22 +24,85 @@ public class UserMemberUpdateVo { /** * 省 */ - private Integer province; + @NotNull(message = "请选择省") + private Integer provinceId; /** * 市 */ - private Integer city; + @NotNull(message = "请选择市") + private Integer cityId; /** * 区 */ - private Integer area; + @NotNull(message = "请选择区") + private Integer areaId; /** * 生日 */ - @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "请选择生日日期") + @DateTimeFormat(pattern = "yyyy-MM-dd") private Date birthday; + public UserMemberUpdateVo() { + } + + public UserMemberUpdateVo(String nickname, String headimg, Integer provinceId, Integer cityId, Integer areaId, Date birthday) { + this.nickname = nickname; + this.headimg = headimg; + this.provinceId = provinceId; + this.cityId = cityId; + this.areaId = areaId; + this.birthday = birthday; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } + + public String getHeadimg() { + return headimg; + } + + public void setHeadimg(String headimg) { + this.headimg = headimg; + } + + public Integer getProvinceId() { + return provinceId; + } + + public void setProvinceId(Integer provinceId) { + this.provinceId = provinceId; + } + + public Integer getCityId() { + return cityId; + } + + public void setCityId(Integer cityId) { + this.cityId = cityId; + } + + public Integer getAreaId() { + return areaId; + } + + public void setAreaId(Integer areaId) { + this.areaId = areaId; + } + + public Date getBirthday() { + return birthday; + } + + public void setBirthday(Date birthday) { + this.birthday = birthday; + } }