From bf2b3ac60cd6c7f07c7d248ced0635c4495fe53d Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 17 Oct 2018 13:14:40 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF][=E6=96=B0=E5=A2=9E]:=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=AE=8C=E5=96=84=E4=B8=8E=E8=8E=B7?= =?UTF-8?q?=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxUserGrantController.java | 46 +++++++++++++++++-- .../java/com/iformall/common/ErrorCode.java | 2 +- .../com/iformall/domain/vo/WxCUserVo.java | 39 ++++++++++++++++ 3 files changed, 81 insertions(+), 6 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 4393d8fa8..d172a548e 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -11,10 +11,7 @@ import com.iformall.annotation.AuthIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxAppinfo; -import com.iformall.domain.po.WxCUser; -import com.iformall.domain.po.WxCUserCar; -import com.iformall.domain.po.WxLevelConfig; +import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCUserVo; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.service.*; @@ -23,6 +20,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; +import org.apache.http.util.EntityUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -49,6 +47,9 @@ public class WxUserGrantController extends BaseController { @Autowired private WxCUserService wxCUserService; + @Autowired + private WxCUserBasicInfoService wxCUserBasicInfoService; + @Autowired private WxCUserCarService wxCUserCarService; @@ -365,8 +366,15 @@ public class WxUserGrantController extends BaseController { userVo.setLevelName(levelConfig.getLevel()); } } + WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getId()); + if (wxCUserBasicInfo != null) { + userVo.setName(wxCUserBasicInfo.getName()); + userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); + userVo.setSex(wxCUserBasicInfo.getSex()); + userVo.setAddress(wxCUserBasicInfo.getAddress()); + } } - return new ResultData(Result.SUCCESS,"查询成功", userVo); + return new ResultData(userVo); } @ApiOperation("当前用户名下是否有车") @@ -470,5 +478,33 @@ public class WxUserGrantController extends BaseController { } } + /** + * 用户更新信息 + * @return + */ + @PostMapping("/updateUserInfo") + @ApiOperation(value = "用户更新信息", notes="") + public ResultData updateUserInfo(@ModelAttribute WxCUserBasicInfo wxCUserBasicInfo) { + if (wxCUserBasicInfo == null) + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + if (wxCUserBasicInfoService.getById(getUser().getId()) == null) + return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); + + if (wxCUserBasicInfo.getName() != null || + wxCUserBasicInfo.getBirthdate() != null || + wxCUserBasicInfo.getSex() != null || + wxCUserBasicInfo.getAddress() != null) { + WxCUserBasicInfo record = new WxCUserBasicInfo(); + record.setName(wxCUserBasicInfo.getName()); + record.setBirthdate(wxCUserBasicInfo.getBirthdate()); + record.setSex(wxCUserBasicInfo.getSex() ); + record.setAddress(wxCUserBasicInfo.getAddress()); + record.setId(getUser().getId()); + record.setUpdateDate(new Date()); + wxCUserBasicInfoService.update(wxCUserBasicInfo); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, wxCUserBasicInfo); + } + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 697057e59..6a241be9e 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -48,7 +48,7 @@ public enum ErrorCode{ /** * 用户2000-2099 */ - + USER_IS_NOT_MEMBER(1989,"用户还未授权手机号成为会员"), USER_PHONE_IS_NOT_FOUND(1990,"手机号不存在"), USER_DEL_SELF(1991,"用户删除自己"), USER_NOT_ADMIN(1992,"用户非超管"), diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java index ccd165016..15b1341bc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCUserVo.java @@ -3,6 +3,8 @@ package com.iformall.domain.vo; import com.iformall.domain.po.WxCUser; +import java.util.Date; + /** * Created by syf on 2018/8/30. */ @@ -10,6 +12,43 @@ public class WxCUserVo extends WxCUser { // 等级名称 private String levelName; + private Date birthdate; + private Integer sex; + private String address; + + public Date getBirthdate() { + return birthdate; + } + + public void setBirthdate(Date birthdate) { + this.birthdate = birthdate; + } + + public Integer getSex() { + return sex; + } + + public void setSex(Integer sex) { + this.sex = sex; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + private String name; public String getLevelName() { return levelName;