酒厂小程序查询个人信息和修改手机号邮箱入参修改

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/controller/wx/WxUserInfoController.java

@@ -28,10 +28,10 @@ public class WxUserInfoController {
     private UserManagerService userManagerService;
 
     @ApiOperation("查询个人信息")
-    @GetMapping("getUserInfoWx/{userId}")
-    public BaseResponse<GetUserInfoWxRes> getUserInfoWx(@PathVariable("userId") Long userId){
+    @GetMapping("getUserInfoWx")
+    public BaseResponse<GetUserInfoWxRes> getUserInfoWx(){
         //查询单个用户信息
-        GetUserInfoWxRes result = userManagerService.getUserInfoWx(userId);
+        GetUserInfoWxRes result = userManagerService.getUserInfoWx();
         //包装出参
         return BaseResponse.create(result);
     }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/UpdatePhoneEmailWxReq.java

@@ -19,10 +19,6 @@ import java.io.Serializable;
 @ApiModel
 public class UpdatePhoneEmailWxReq implements Serializable {
 
-    @NotNull(message = "用户id为空")
-    @ApiModelProperty(value = "用户id")
-    private Long id;
-
     @NotEmpty(message = "手机号为空")
     @Pattern(regexp = "^1[0-9]{10}$", message = "手机格式不正确，请重新输入")
     @ApiModelProperty(value = "手机号")

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/UserManagerService.java

@@ -71,11 +71,10 @@ public interface UserManagerService {
     /**
      * 根据id查询单个用户信息（小程序）
      *
-     * @param userInfoId
      * @return
      * @throws Exception
      */
-    GetUserInfoWxRes getUserInfoWx(Long userInfoId);
+    GetUserInfoWxRes getUserInfoWx();
 
     /**
      * 更新手机号和邮箱（小程序）

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/UserManagerServiceImpl.java

@@ -261,9 +261,9 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
     }
 
     @Override
-    public GetUserInfoWxRes getUserInfoWx(Long userInfoId) {
+    public GetUserInfoWxRes getUserInfoWx() {
         //查询用户
-        UserInfo userInfo = userInfoMapper.selectById(userInfoId);
+        UserInfo userInfo = userInfoMapper.selectById(userUtil.getUser().getId());
 
         //构造出参
         GetUserInfoWxRes getUserInfoWxRes = PojoConverterUtils.copy(userInfo,GetUserInfoWxRes.class);
@@ -276,13 +276,11 @@ public class UserManagerServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo
     @Transactional(rollbackFor = Exception.class)
     public void updatePhoneEmailWx(UpdatePhoneEmailWxReq req) {
         //0-校验入参
-        UserInfo userInfo = userInfoMapper.selectById(req.getId());
-        if(Objects.isNull(userInfo)){
-            throw new BusinessException("该用户不存在。");
-        }
+        UserInfo userInfo = userInfoMapper.selectById(userUtil.getUser().getId());
+        AssertUtil.isNull(userInfo, "该用户不存在。");
         userInfo.setEmail(req.getEmail());
         userInfo.setPhone(req.getPhone());
-        userInfo.setUpdateBy(userUtil.getWholeUser().getId());
+        userInfo.setUpdateBy(userUtil.getUser().getId());
         userInfoMapper.updateById(userInfo);
     }