Merge branch 'dev-tangxvhui' into test
正在显示
4 个修改的文件
包含
28 行增加
和
3 行删除
| @@ -159,7 +159,7 @@ func (service *AuthService) MobileLogin(param *command.MobileLoginCommand) (map[ | @@ -159,7 +159,7 @@ func (service *AuthService) MobileLogin(param *command.MobileLoginCommand) (map[ | ||
| 159 | } | 159 | } |
| 160 | 160 | ||
| 161 | // 获取我的 | 161 | // 获取我的 |
| 162 | -func (service *AuthService) MeInfo(param *command.GetMeInfo) (*adapter.MeInfo, error) { | 162 | +func (service *AuthService) MeInfo(param *command.GetMeInfo) (map[string]interface{}, error) { |
| 163 | 163 | ||
| 164 | transactionContext, err := factory.CreateTransactionContext(nil) | 164 | transactionContext, err := factory.CreateTransactionContext(nil) |
| 165 | if err != nil { | 165 | if err != nil { |
| @@ -228,5 +228,7 @@ loop: | @@ -228,5 +228,7 @@ loop: | ||
| 228 | if len(parentUser) > 0 { | 228 | if len(parentUser) > 0 { |
| 229 | info.IsParent = true | 229 | info.IsParent = true |
| 230 | } | 230 | } |
| 231 | - return &info, nil | 231 | + return map[string]interface{}{ |
| 232 | + "user": info, | ||
| 233 | + }, nil | ||
| 232 | } | 234 | } |
| 1 | package controllers | 1 | package controllers |
| 2 | + | ||
| 3 | +import ( | ||
| 4 | + "github.com/linmadan/egglib-go/web/beego" | ||
| 5 | + "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/notify/command" | ||
| 6 | + "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/application/notify/service" | ||
| 7 | + "gitlab.fjmaimaimai.com/allied-creation/performance/pkg/port/beego/middlewares" | ||
| 8 | +) | ||
| 9 | + | ||
| 10 | +// 获取个人的消息提示 | ||
| 11 | +type MessagePersonalController struct { | ||
| 12 | + beego.BaseController | ||
| 13 | +} | ||
| 14 | + | ||
| 15 | +// 周期综合自评是否开启,是否提示 | ||
| 16 | +func (c *MessagePersonalController) TodayMessageSummaryEvaluation() { | ||
| 17 | + srv := service.NewMessagePersonalService() | ||
| 18 | + userReq := middlewares.GetUser(c.Ctx) | ||
| 19 | + param := command.GetUserMessageCommand{} | ||
| 20 | + param.UserId = int(userReq.UserId) | ||
| 21 | + data, err := srv.TodayMessageSummaryEvaluationSelf(¶m) | ||
| 22 | + c.Response(data, err) | ||
| 23 | +} |
| 1 | +package routers |
-
请 注册 或 登录 后发表评论