diff --git a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/feign/RemoteUmsMemberService.java b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/feign/RemoteUmsMemberService.java index 8d83aee95..6e6d4f088 100644 --- a/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/feign/RemoteUmsMemberService.java +++ b/mall-ums/mall-ums-api/src/main/java/com/youlai/mall/ums/api/feign/RemoteUmsMemberService.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; public interface RemoteUmsMemberService { @GetMapping("/members/member/{openid}") - Result loadMemberByOpenid(@PathVariable String openid); + Result loadMemberByOpenid(@PathVariable String openid); @PostMapping("/members") Result add(@RequestBody UmsMember umsMember); diff --git a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/feign/RemoteAdminService.java b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/feign/RemoteAdminService.java index 8c8be37b4..bd570cfa0 100644 --- a/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/feign/RemoteAdminService.java +++ b/youlai-admin/youlai-admin-api/src/main/java/com/youlai/admin/api/feign/RemoteAdminService.java @@ -1,6 +1,7 @@ package com.youlai.admin.api.feign; import com.youlai.admin.api.dto.UserDTO; +import com.youlai.common.core.result.Result; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -9,5 +10,5 @@ import org.springframework.web.bind.annotation.PathVariable; public interface RemoteAdminService { @GetMapping("/users/user/{username}") - UserDTO loadUserByUsername(@PathVariable String username); + Result loadUserByUsername(@PathVariable String username); } diff --git a/youlai-auth/src/main/java/com/youlai/auth/controller/WxOAuthController.java b/youlai-auth/src/main/java/com/youlai/auth/controller/WxOAuthController.java index 92cd19734..319b4aaac 100644 --- a/youlai-auth/src/main/java/com/youlai/auth/controller/WxOAuthController.java +++ b/youlai-auth/src/main/java/com/youlai/auth/controller/WxOAuthController.java @@ -78,7 +78,16 @@ public class WxOAuthController { String openid = session.getOpenid(); String sessionKey = session.getSessionKey(); - Result result = remoteUmsMemberService.loadMemberByOpenid(openid); + Result result = remoteUmsMemberService.loadMemberByOpenid(openid); + if(ResultCode.SUCCESS.getCode().equals(result.getCode())){ + MemberDTO memberDTO = result.getData(); + if(memberDTO!=null){ + + } + + + } + WxMaUserInfo userInfo; UmsMember member; if (memberDTO == null || memberDTO.getId() == null) {