Commit e56afe11 authored by xiaoguang.xu's avatar xiaoguang.xu

修正user_detial 请求参数接收方式错误的问题

parent f5c7d281
...@@ -9,8 +9,6 @@ import cn.quantgroup.xyqb.model.JsonResult; ...@@ -9,8 +9,6 @@ import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.service.auth.IIdCardService; import cn.quantgroup.xyqb.service.auth.IIdCardService;
import cn.quantgroup.xyqb.service.user.IUserDetailService; import cn.quantgroup.xyqb.service.user.IUserDetailService;
import cn.quantgroup.xyqb.service.user.IUserService; import cn.quantgroup.xyqb.service.user.IUserService;
import cn.quantgroup.xyqb.validator.ChineseName;
import cn.quantgroup.xyqb.validator.IdCard;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
...@@ -45,7 +43,7 @@ public class UserDetailController { ...@@ -45,7 +43,7 @@ public class UserDetailController {
@Valid @RequestBody UserDetailReq userDetailReq) { @Valid @RequestBody UserDetailReq userDetailReq) {
UserDetail userDetail = userDetailService.findByUserId(userId); UserDetail userDetail = userDetailService.findByUserId(userId);
if (userDetail == null) { if (userDetail == null) {
return save(userId, userDetailReq.getName(), userDetailReq.getIdNo()); return save(userId, userDetailReq);
} }
//更新 //更新
userDetail.setName(userDetailReq.getName()); userDetail.setName(userDetailReq.getName());
...@@ -59,27 +57,25 @@ public class UserDetailController { ...@@ -59,27 +57,25 @@ public class UserDetailController {
* 保存用户实名信息 * 保存用户实名信息
* *
* @param userId * @param userId
* @param name * @param userDetailReq
* @param idNo
* @return * @return
*/ */
@PostMapping("/{userId}") @PostMapping("/{userId}")
public JsonResult save(@PathVariable Long userId, public JsonResult save(@PathVariable Long userId,
@ChineseName String name, @Valid @RequestBody UserDetailReq userDetailReq) {
@IdCard String idNo) {
UserDetail userDetail = userDetailService.findByUserId(userId); UserDetail userDetail = userDetailService.findByUserId(userId);
if (userDetail != null) { if (userDetail != null) {
return JsonResult.buildSuccessResultGeneric(userDetail); return JsonResult.buildSuccessResultGeneric(userDetail);
} }
User user = userService.findById(userId); User user = userService.findById(userId);
IdCardInfo idCardInfo = idCardService.getIdCardInfo(idNo); IdCardInfo idCardInfo = idCardService.getIdCardInfo(userDetailReq.getIdNo());
Timestamp now = new Timestamp(System.currentTimeMillis()); Timestamp now = new Timestamp(System.currentTimeMillis());
userDetail = new UserDetail(); userDetail = new UserDetail();
userDetail.setUserId(userId); userDetail.setUserId(userId);
userDetail.setName(name); userDetail.setName(userDetailReq.getName());
userDetail.setPhoneNo(user.getPhoneNo()); userDetail.setPhoneNo(user.getPhoneNo());
userDetail.setIdNo(idNo); userDetail.setIdNo(userDetailReq.getIdNo());
userDetail.setIdType(IdType.ID_CARD); userDetail.setIdType(IdType.ID_CARD);
userDetail.setGender(idCardInfo.getGender()); userDetail.setGender(idCardInfo.getGender());
userDetail.setCreatedAt(now); userDetail.setCreatedAt(now);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment