EggPlanet
/
egg_app
3
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

update

herolist
dengbiao 1 week ago
parent
0cdea2faa4
commit
d10fad4da8
5 changed files with 198 additions and 168 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -0
      app/hdl/hdl_user.go
  2. +1
    -0
      app/md/md_login.go
  3. +71
    -63
      docs/docs.go
  4. +71
    -63
      docs/swagger.json
  5. +48
    -42
      docs/swagger.yaml

+ 7
- 0
app/hdl/hdl_user.go View File

@@ -26,6 +26,7 @@ import (
"github.com/olivere/elastic/v7" "github.com/olivere/elastic/v7"
"github.com/syyongx/php2go" "github.com/syyongx/php2go"
"github.com/tidwall/gjson" "github.com/tidwall/gjson"
"strconv"
"strings" "strings"
"time" "time"
) )
@@ -415,6 +416,11 @@ func ParentInfo(c *gin.Context) {
if user.CustomInviteCode != "" { if user.CustomInviteCode != "" {
code = user.CustomInviteCode code = user.CustomInviteCode
} }
imUser, err1 := svc.GetImUser(0, user.Phone)
if err1 != nil {
e.OutErr(c, e.ERR, err1.Error())
return
}
res := md.ParentInfo{ res := md.ParentInfo{
Nickname: user.Nickname, Nickname: user.Nickname,
LevelName: level.LevelName, LevelName: level.LevelName,
@@ -423,6 +429,7 @@ func ParentInfo(c *gin.Context) {
Id: utils.Int64ToStr(user.Id), Id: utils.Int64ToStr(user.Id),
Phone: user.Phone, Phone: user.Phone,
WechatAccount: user.WechatAccount, WechatAccount: user.WechatAccount,
ImUid: strconv.FormatInt(imUser.UserId, 10),
} }
e.OutSuc(c, res, nil) e.OutSuc(c, res, nil)
return return


+ 1
- 0
app/md/md_login.go View File

@@ -72,4 +72,5 @@ type ParentInfo struct {
Id string `json:"id" example:"个人ID号"` Id string `json:"id" example:"个人ID号"`
Phone string `json:"phone" example:"手机号"` Phone string `json:"phone" example:"手机号"`
WechatAccount string `json:"wechat_account" example:"微信号"` WechatAccount string `json:"wechat_account" example:"微信号"`
ImUid string `json:"im_uid" example:"im_uid"`
} }

+ 71
- 63
docs/docs.go View File

@@ -4427,6 +4427,68 @@ const docTemplate = `{
} }
} }
}, },
"code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd": {
"type": "object",
"properties": {
"amount": {
"type": "string"
},
"create_time": {
"type": "string"
},
"id": {
"type": "integer"
},
"im_data": {
"type": "string"
},
"im_uid": {
"type": "integer"
},
"ord_no": {
"type": "string"
},
"received_im_user_ids": {
"type": "string"
},
"received_times": {
"type": "string"
},
"received_user_amount": {
"type": "string"
},
"received_user_ids": {
"type": "string"
},
"red_packet_balance_amount": {
"type": "string"
},
"red_packet_balance_nums": {
"type": "integer"
},
"red_packet_nums": {
"type": "integer"
},
"red_packet_type": {
"type": "integer"
},
"state": {
"type": "integer"
},
"uid": {
"type": "integer"
},
"update_time": {
"type": "string"
},
"wait_draw_im_user_ids": {
"type": "string"
},
"wait_draw_user_ids": {
"type": "string"
}
}
},
"comm.AccessRecordsReq": { "comm.AccessRecordsReq": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -5986,6 +6048,10 @@ const docTemplate = `{
"now_team_user": { "now_team_user": {
"description": "团队人数", "description": "团队人数",
"type": "integer" "type": "integer"
},
"real_name_num": {
"description": "团队实名人数",
"type": "integer"
} }
} }
}, },
@@ -6072,6 +6138,10 @@ const docTemplate = `{
"type": "string", "type": "string",
"example": "个人ID号" "example": "个人ID号"
}, },
"im_uid": {
"type": "string",
"example": "im_uid"
},
"invite_code": { "invite_code": {
"type": "string", "type": "string",
"example": "邀请码" "example": "邀请码"
@@ -6282,7 +6352,7 @@ const docTemplate = `{
"description": "红包详情信息", "description": "红包详情信息",
"allOf": [ "allOf": [
{ {
"$ref": "#/definitions/model.ImSendRedPackageOrd"
"$ref": "#/definitions/code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd"
} }
] ]
}, },
@@ -7041,68 +7111,6 @@ const docTemplate = `{
} }
} }
}, },
"model.ImSendRedPackageOrd": {
"type": "object",
"properties": {
"amount": {
"type": "string"
},
"create_time": {
"type": "string"
},
"id": {
"type": "integer"
},
"im_data": {
"type": "string"
},
"im_uid": {
"type": "integer"
},
"ord_no": {
"type": "string"
},
"received_im_user_ids": {
"type": "string"
},
"received_times": {
"type": "string"
},
"received_user_amount": {
"type": "string"
},
"received_user_ids": {
"type": "string"
},
"red_packet_balance_amount": {
"type": "string"
},
"red_packet_balance_nums": {
"type": "integer"
},
"red_packet_nums": {
"type": "integer"
},
"red_packet_type": {
"type": "integer"
},
"state": {
"type": "integer"
},
"uid": {
"type": "integer"
},
"update_time": {
"type": "string"
},
"wait_draw_im_user_ids": {
"type": "string"
},
"wait_draw_user_ids": {
"type": "string"
}
}
},
"pb.SendRedPacketResp": { "pb.SendRedPacketResp": {
"type": "object", "type": "object",
"properties": { "properties": {


+ 71
- 63
docs/swagger.json View File

@@ -4421,6 +4421,68 @@
} }
} }
}, },
"code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd": {
"type": "object",
"properties": {
"amount": {
"type": "string"
},
"create_time": {
"type": "string"
},
"id": {
"type": "integer"
},
"im_data": {
"type": "string"
},
"im_uid": {
"type": "integer"
},
"ord_no": {
"type": "string"
},
"received_im_user_ids": {
"type": "string"
},
"received_times": {
"type": "string"
},
"received_user_amount": {
"type": "string"
},
"received_user_ids": {
"type": "string"
},
"red_packet_balance_amount": {
"type": "string"
},
"red_packet_balance_nums": {
"type": "integer"
},
"red_packet_nums": {
"type": "integer"
},
"red_packet_type": {
"type": "integer"
},
"state": {
"type": "integer"
},
"uid": {
"type": "integer"
},
"update_time": {
"type": "string"
},
"wait_draw_im_user_ids": {
"type": "string"
},
"wait_draw_user_ids": {
"type": "string"
}
}
},
"comm.AccessRecordsReq": { "comm.AccessRecordsReq": {
"type": "object", "type": "object",
"properties": { "properties": {
@@ -5980,6 +6042,10 @@
"now_team_user": { "now_team_user": {
"description": "团队人数", "description": "团队人数",
"type": "integer" "type": "integer"
},
"real_name_num": {
"description": "团队实名人数",
"type": "integer"
} }
} }
}, },
@@ -6066,6 +6132,10 @@
"type": "string", "type": "string",
"example": "个人ID号" "example": "个人ID号"
}, },
"im_uid": {
"type": "string",
"example": "im_uid"
},
"invite_code": { "invite_code": {
"type": "string", "type": "string",
"example": "邀请码" "example": "邀请码"
@@ -6276,7 +6346,7 @@
"description": "红包详情信息", "description": "红包详情信息",
"allOf": [ "allOf": [
{ {
"$ref": "#/definitions/model.ImSendRedPackageOrd"
"$ref": "#/definitions/code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd"
} }
] ]
}, },
@@ -7035,68 +7105,6 @@
} }
} }
}, },
"model.ImSendRedPackageOrd": {
"type": "object",
"properties": {
"amount": {
"type": "string"
},
"create_time": {
"type": "string"
},
"id": {
"type": "integer"
},
"im_data": {
"type": "string"
},
"im_uid": {
"type": "integer"
},
"ord_no": {
"type": "string"
},
"received_im_user_ids": {
"type": "string"
},
"received_times": {
"type": "string"
},
"received_user_amount": {
"type": "string"
},
"received_user_ids": {
"type": "string"
},
"red_packet_balance_amount": {
"type": "string"
},
"red_packet_balance_nums": {
"type": "integer"
},
"red_packet_nums": {
"type": "integer"
},
"red_packet_type": {
"type": "integer"
},
"state": {
"type": "integer"
},
"uid": {
"type": "integer"
},
"update_time": {
"type": "string"
},
"wait_draw_im_user_ids": {
"type": "string"
},
"wait_draw_user_ids": {
"type": "string"
}
}
},
"pb.SendRedPacketResp": { "pb.SendRedPacketResp": {
"type": "object", "type": "object",
"properties": { "properties": {


+ 48
- 42
docs/swagger.yaml View File

@@ -12,6 +12,47 @@ definitions:
description: 总数据量 description: 总数据量
type: integer type: integer
type: object type: object
code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd:
properties:
amount:
type: string
create_time:
type: string
id:
type: integer
im_data:
type: string
im_uid:
type: integer
ord_no:
type: string
received_im_user_ids:
type: string
received_times:
type: string
received_user_amount:
type: string
received_user_ids:
type: string
red_packet_balance_amount:
type: string
red_packet_balance_nums:
type: integer
red_packet_nums:
type: integer
red_packet_type:
type: integer
state:
type: integer
uid:
type: integer
update_time:
type: string
wait_draw_im_user_ids:
type: string
wait_draw_user_ids:
type: string
type: object
comm.AccessRecordsReq: comm.AccessRecordsReq:
properties: properties:
index: index:
@@ -1101,6 +1142,9 @@ definitions:
now_team_user: now_team_user:
description: 团队人数 description: 团队人数
type: integer type: integer
real_name_num:
description: 团队实名人数
type: integer
type: object type: object
md.MyFansUserListResp: md.MyFansUserListResp:
properties: properties:
@@ -1160,6 +1204,9 @@ definitions:
id: id:
example: 个人ID号 example: 个人ID号
type: string type: string
im_uid:
example: im_uid
type: string
invite_code: invite_code:
example: 邀请码 example: 邀请码
type: string type: string
@@ -1306,7 +1353,7 @@ definitions:
properties: properties:
detail: detail:
allOf: allOf:
- $ref: '#/definitions/model.ImSendRedPackageOrd'
- $ref: '#/definitions/code_fnuoos_com_EggPlanet_egg_models_git_src_model.ImSendRedPackageOrd'
description: 红包详情信息 description: 红包详情信息
list: list:
description: 领取红包用户列表 description: 领取红包用户列表
@@ -1828,47 +1875,6 @@ definitions:
description: 余额 description: 余额
type: string type: string
type: object type: object
model.ImSendRedPackageOrd:
properties:
amount:
type: string
create_time:
type: string
id:
type: integer
im_data:
type: string
im_uid:
type: integer
ord_no:
type: string
received_im_user_ids:
type: string
received_times:
type: string
received_user_amount:
type: string
received_user_ids:
type: string
red_packet_balance_amount:
type: string
red_packet_balance_nums:
type: integer
red_packet_nums:
type: integer
red_packet_type:
type: integer
state:
type: integer
uid:
type: integer
update_time:
type: string
wait_draw_im_user_ids:
type: string
wait_draw_user_ids:
type: string
type: object
pb.SendRedPacketResp: pb.SendRedPacketResp:
properties: properties:
seq: seq:


Write Preview
Loading…
Cancel
Save