Commit 5d5848dc authored by chenweijian's avatar chenweijian

派对邀请

parent 0ee79f63
...@@ -65,9 +65,9 @@ func IsInInviteApply(model *domain.Model, userId mysql.ID) (bool, error) { ...@@ -65,9 +65,9 @@ func IsInInviteApply(model *domain.Model, userId mysql.ID) (bool, error) {
} }
// 检查被邀请人是否存在 // 检查被邀请人是否存在
func GetInviteApplyNumByType(model *domain.Model, gType int, beginTime, endTime time.Time, userId uint64) (int, error) { func GetInviteApplyNumByType(model *domain.Model, gType int, beginTime, endTime time.Time, userIds []uint64) (int, error) {
var count int64 var count int64
db := model.Db.Model(InviteApply{}).Where("user_id=?", userId).Where("created_time >= ? and created_time <= ?", beginTime, endTime) db := model.Db.Model(InviteApply{}).Where("user_id in (?)", userIds).Where("created_time >= ? and created_time <= ?", beginTime, endTime)
switch gType { // 1.已申请2.待审核3.已通过4.已拒绝 switch gType { // 1.已申请2.待审核3.已通过4.已拒绝
case 2: case 2:
db = db.Where("`status` = ?", 0) db = db.Where("`status` = ?", 0)
......
...@@ -160,10 +160,18 @@ func InviteApplyList(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -160,10 +160,18 @@ func InviteApplyList(c *gin.Context) (*mycontext.MyContext, error) {
var model = domain.CreateModelContext(myCtx) var model = domain.CreateModelContext(myCtx)
agentIds := []uint64{userId}
if promotion_m.IsPromotionManager(model, userId) {
agentIds, err = promotion_m.GetPromotionManagerAgentList(model, userId)
if err != nil {
return myCtx, err
}
}
if param.Type == 0 { // 返回所有Type类型有多少条数 if param.Type == 0 { // 返回所有Type类型有多少条数
numList := make([]*invite_cv.InviteApplyNumRes, 0, 4) numList := make([]*invite_cv.InviteApplyNumRes, 0, 4)
for _, gType := range []int{1, 2, 3, 4} { // 1.已申请2.待审核3.已通过4.已拒绝 for _, gType := range []int{1, 2, 3, 4} { // 1.已申请2.待审核3.已通过4.已拒绝
num, err := invite_m.GetInviteApplyNumByType(model, gType, param.BeginTime, param.EndTime, userId) num, err := invite_m.GetInviteApplyNumByType(model, gType, param.BeginTime, param.EndTime, agentIds)
if err != nil { if err != nil {
return myCtx, err return myCtx, err
} }
...@@ -173,14 +181,6 @@ func InviteApplyList(c *gin.Context) (*mycontext.MyContext, error) { ...@@ -173,14 +181,6 @@ func InviteApplyList(c *gin.Context) (*mycontext.MyContext, error) {
return myCtx, nil return myCtx, nil
} }
agentIds := []uint64{userId}
if promotion_m.IsPromotionManager(model, userId) {
agentIds, err = promotion_m.GetPromotionManagerAgentList(model, userId)
if err != nil {
return myCtx, err
}
}
list, total, err := invite_m.GetApplyList(model, agentIds, param.PageIndex, param.PageSize, param.Type, param.BeginTime, param.EndTime) list, total, err := invite_m.GetApplyList(model, agentIds, param.PageIndex, param.PageSize, param.Type, param.BeginTime, param.EndTime)
if err != nil { if err != nil {
model.Log.Errorf("GetApplyList param:%v, err:%v", param, err) model.Log.Errorf("GetApplyList param:%v, err:%v", param, err)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment