|
@@ -8,6 +8,8 @@ import cn.iocoder.yudao.module.member.dal.dataobject.level.MemberLevelDO;
|
|
|
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
|
|
|
import cn.iocoder.yudao.module.member.service.level.MemberLevelService;
|
|
|
import cn.iocoder.yudao.module.member.service.user.MemberUserService;
|
|
|
+import cn.iocoder.yudao.module.trade.api.brokerage.BrokerageApi;
|
|
|
+import cn.iocoder.yudao.module.trade.api.brokerage.dto.BrokerageUserDTO;
|
|
|
import io.swagger.v3.oas.annotations.Operation;
|
|
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.util.Optional;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
|
import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
|
|
@@ -33,14 +36,18 @@ public class AppMemberUserController {
|
|
|
@Resource
|
|
|
private MemberLevelService levelService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private BrokerageApi brokerageApi;
|
|
|
+
|
|
|
@GetMapping("/get")
|
|
|
@Operation(summary = "获得基本信息")
|
|
|
@PreAuthenticated
|
|
|
public CommonResult<AppMemberUserInfoRespVO> getUserInfo() {
|
|
|
MemberUserDO user = userService.getUser(getLoginUserId());
|
|
|
MemberLevelDO level = levelService.getLevel(user.getLevelId());
|
|
|
+ BrokerageUserDTO brokerageUser = brokerageApi.getBrokerageUser(user.getId());
|
|
|
return success(MemberUserConvert.INSTANCE.convert(user, level)
|
|
|
- .setBrokerageEnabled(true) // TODO @疯狂:这里我先写死,后面改成 db 返回;
|
|
|
+ .setBrokerageEnabled(Optional.ofNullable(brokerageUser).map(BrokerageUserDTO::getBrokerageEnabled).orElse(false))
|
|
|
);
|
|
|
}
|
|
|
|