diff --git a/modules/web/handler/activity.go b/modules/web/handler/activity.go index 579dcac..7b97e54 100644 --- a/modules/web/handler/activity.go +++ b/modules/web/handler/activity.go @@ -1323,212 +1323,6 @@ func ActivityBreakGiftInfo(c *gin.Context) { a.Data = resp } -func ActivityWeekCardInfo(c *gin.Context) { - a := app.NewApp(c) - defer func() { - a.Response() - }() - a.GetUID() - if !a.CheckActivityExpire(common.ActivityIDWeekCard) { - return - } - resp := &values.ActivityWeekCardInfoResp{} - a.Data = resp - cons := call.GetConfigWeekCard() - _ = cons - cardInfo := new(common.ActivityWeekCardData) - if a.UID > 0 { - cardInfo = call.GetUserWeekCard(a.UID) - } - var rewardList []int64 - var err error - _ = err - //rewardList, err = util.GenerateRandomSequence(cons.RewardAmount, cons.MiniLimit, 5) - //if err != nil { - // log.Error("err:%v", err) - //} - //rewardList = append([]int64{cons.DayOneReward}, rewardList...) - //rewardList = append(rewardList, 0) - //if cardInfo.ID <= 0 || len(cardInfo.Rewards) == 0 { - // cardInfo.Day = 0 - // rewardList, err = util.GenerateRandomSequence(cons.RewardAmount, cons.MiniLimit, 5) - // if err != nil { - // log.Error("err:%v", err) - // } - // rewardList = append([]int64{cons.DayOneReward}, rewardList...) - // rewardList = append(rewardList, 0) - // if cardInfo.ID <= 0 { - // cardInfo.Rewards = strings.Join(util.Int64SliceToStringSlice(rewardList), ",") - // if a.UID > 0 { - // db.Mysql().Create(cardInfo) - // } - // } else { - // cardInfo.Rewards = strings.Join(util.Int64SliceToStringSlice(rewardList), ",") - // db.Mysql().Update(&common.ActivityWeekCardData{UID: a.UID}, map[string]interface{}{ - // "rewards": cardInfo.Rewards, - // }) - // } - //} - - if rewardList == nil { - rewardList, _ = util.StringToInt64Slice(cardInfo.Rewards, ",") - } - if cardInfo.RechargeTime != 0 { - resp.RechargeStatus = true - } - // step:签完7天就重置 - if cardInfo.Day >= len(rewardList) { - resp.RechargeStatus = false - } - for _, item := range rewardList { - _ = item - //resp.RewardList = append(resp.RewardList, values.WeekCardInfo{ - // Min: cons.MiniLimit, - // Max: cons.RewardAmount - cons.MiniLimit*4, - // Val: item, - //}) - } - resp.Status = true - if config.GetBase().Release { - if util.IsSameDayTimeStamp(time.Now().Unix(), cardInfo.LastDraw) { - resp.Status = false - } - } - resp.RewardDay = cardInfo.Day - resp.ChannelList = call.GetConfigPayChannelsByID(common.CurrencyINR) - resp.ProductList = call.GetConfigPayProductByActivityID(common.ActivityIDWeekCard) - if resp.Status && resp.RechargeStatus { - call.PushRed(a.UID, pb.RedPointModule_RedPointWeekCard, 1) - } - call.UploadActivityData(a.UID, common.ActivityIDSign, common.ActivityDataClick, 0) -} - -func ActivityWeekCardDraw(c *gin.Context) { - a := app.NewApp(c) - defer func() { - a.Response() - }() - if !a.CheckActivityExpire(common.ActivityIDWeekCard) { - return - } - req := new(values.ActivityWeekCardDrawReq) - if !a.S(req) { - return - } - resp := &values.ActivityWeekCardDrawResp{} - a.Data = resp - // conf := call.GetConfigActivityWeekCard() - card := call.GetUserWeekCard(a.UID) - if card.ID == 0 { - a.Code = values.CodeRetry - return - } - now := time.Now().Unix() - if config.GetBase().Release { - if util.IsSameDayTimeStamp(now, card.LastDraw) { - a.Code = values.CodeRetry - a.Msg = "today has reward" - return - } - } - rewards, _ := util.StringToInt64Slice(card.Rewards, ",") - if card.Day >= len(rewards) { - a.Code = values.CodeRetry - a.Msg = "The weekly card has been collected" - return - } - rows, err := db.Mysql().UpdateRes(&common.ActivityWeekCardData{UID: a.UID}, - map[string]interface{}{"day": gorm.Expr("day + 1"), "last_draw": now}) - if rows == 0 || err != nil { - log.Error("err:%v", err) - a.Code = values.CodeRetry - return - } - var reward int64 - if card.Day < 6 { - reward = rewards[card.Day] * common.DecimalDigits - } else { - // 第几天折扣券 - // 用户画像一:6天内充值3笔及以上用户 - // 推送当前最高额度向上一档充值满减卷 - // 用户画像二:只解锁周卡,未充值的玩家 - // 推送当前额度向下一档充值满减卷,最低300 - var list []common.CurrencyBalance - q := elastic.NewBoolQuery() - q.Filter(elastic.NewRangeQuery("time").Gte(card.RechargeTime)) - q.Filter(elastic.NewRangeQuery("time").Lte(now)) - q.Filter(elastic.NewRangeQuery("event").Gte(common.CurrencyEventReCharge)) - q.Must(elastic.NewTermsQuery("uid", a.UID)) - db.ES().QueryList(common.ESIndexBalance, 0, 100, q, &list, "time", true) - up := false - maxAmount := card.RechargeAmount - if len(list) >= 3 { - up = true - for _, item := range list { - if item.Value > maxAmount { - maxAmount = item.Value - } - } - } - log.Info("maxAmount:%v", maxAmount) - ticket := call.GetConfigDiscountTicketByAmount(maxAmount) - log.Info("ticket:%v", ticket) - if ticket.ID > 0 { - // 赠送优惠券 - tickets := call.GetConfigDiscountTicket() - sort.Slice(tickets, func(i, j int) bool { - return tickets[i].RechargeAmount < tickets[j].RechargeAmount - }) - // 获取下一档 - nextIdx := -1 - for idx, item := range tickets { - if item.RechargeAmount == maxAmount { - if up { - nextIdx = idx + 1 - } else if item.RechargeAmount >= 300*common.DecimalDigits { - nextIdx = idx - 1 - } - break - } - } - var nextTicket = ticket - if len(tickets) > nextIdx && nextIdx != -1 { - nextTicket = tickets[nextIdx] - } - if up { - call.AddUserDiscountTicket(a.UID, ticket.DiscountAmount, ticket.RechargeAmount, -1, 0, false) - call.SendMailWithContent(a.UID, call.SystemTitle, fmt.Sprintf(call.EmailDiscount, ticket.DiscountAmount/common.DecimalDigits, ticket.RechargeAmount/common.DecimalDigits)) - resp.DiscountTicket = ticket.DiscountAmount - resp.Amount = ticket.RechargeAmount - } else if nextTicket.ID > 0 { - call.AddUserDiscountTicket(a.UID, nextTicket.DiscountAmount, nextTicket.RechargeAmount, -1, 1, false) - call.SendMailWithContent(a.UID, call.SystemTitle, fmt.Sprintf(call.EmailDiscount, ticket.DiscountAmount/common.DecimalDigits, ticket.RechargeAmount/common.DecimalDigits)) - resp.DiscountTicket = nextTicket.DiscountAmount - resp.Amount = nextTicket.RechargeAmount - } - } - } - resource := common.CurrencyResourceWeekCard - if card.Day > 0 { - resource = common.CurrencyResourceBonus - } - resp.Reward = reward - if reward > 0 { - call.UpdateCurrencyPro(&common.UpdateCurrency{ - CurrencyBalance: &common.CurrencyBalance{ - UID: a.UID, - Type: common.CurrencyINR, - Value: reward, - Event: common.CurrencyEventActivityWeekCard, - ChannelID: a.Channel, - NeedBet: call.GetConfigCurrencyResourceNeedBet(resource, reward), - }, - }) - } - call.PushRed(a.UID, pb.RedPointModule_RedPointWeekCard, 0) - call.UploadActivityData(a.UID, common.ActivityIDSign, common.ActivityDataJoin, reward) -} - func ActivitySlotsInfo(c *gin.Context) { a := app.NewApp(c) defer func() { @@ -2144,42 +1938,6 @@ func ActivityPopup(c *gin.Context) { } } -func WeekCardInfo(c *gin.Context) { - a := app.NewApp(c) - defer func() { - a.Response() - }() - req := values.ActivityPopupReq{} - if !a.S(&req) { - return - } - resp := new(values.ActivityPopupResp) - a.Data = resp - if req.JumpType == 0 { - resp.List = call.GetConfigActivityPopup() - } else { - resp.List = call.GetConfigActivityPopupByType(req.JumpType) - } -} - -func WeekCardDraw(c *gin.Context) { - a := app.NewApp(c) - defer func() { - a.Response() - }() - req := values.ActivityPopupReq{} - if !a.S(&req) { - return - } - resp := new(values.ActivityPopupResp) - a.Data = resp - if req.JumpType == 0 { - resp.List = call.GetConfigActivityPopup() - } else { - resp.List = call.GetConfigActivityPopupByType(req.JumpType) - } -} - func DiscountTicketInfo(c *gin.Context) { a := app.NewApp(c) defer func() { diff --git a/modules/web/providers/sn/api.go b/modules/web/providers/sn/api.go index 36440e8..4ee41ad 100644 --- a/modules/web/providers/sn/api.go +++ b/modules/web/providers/sn/api.go @@ -191,16 +191,14 @@ type GameControlCallbackResp struct { type ControlReq struct { BaseReq - ThirdName string `json:"third_name"` - ControlId int `json:"control_id"` - TemplateId int `json:"template_id"` - Data []struct { + ThirdName string `json:"third_name"` + ControlId int `json:"control_id"` + Data []struct { TargetRtp int `json:"target_rtp"` } `json:"data"` - Sn int `json:"sn"` - ControlDesc string `json:"control_desc"` - AgentId int `json:"agent_id"` - UserId int `json:"user_id"` + Sn int `json:"sn"` + AgentId int `json:"agent_id"` + UserId int `json:"user_id"` } type ControlResp struct { diff --git a/modules/web/providers/sn/handler.go b/modules/web/providers/sn/handler.go index 4b44d90..d95b3e7 100644 --- a/modules/web/providers/sn/handler.go +++ b/modules/web/providers/sn/handler.go @@ -40,7 +40,7 @@ func GetBalance(c *gin.Context) { resp.Code = INVALIDREQUESTERR return } - log.Debug("get balance:%s", string(body)) + log.Debug("sn get balance:%s", string(body)) err = json.Unmarshal(body, &req) if err != nil { log.Error("unmarshal err, %s", err.Error()) @@ -101,7 +101,7 @@ func GameBet(c *gin.Context) { resp.Code = INVALIDREQUESTERR return } - log.Debug("game bet:%s", string(body)) + log.Debug("sn game bet:%s", string(body)) err = json.Unmarshal(body, &req) if err != nil { log.Error("unmarshal err, %s", err.Error()) @@ -198,7 +198,7 @@ func Settle(c *gin.Context) { resp.Code = INVALIDREQUESTERR return } - log.Debug("sn Settle:%s", string(body)) + log.Debug("sn settle:%s", string(body)) err = json.Unmarshal(body, &req) if err != nil { log.Error("unmarshal err, %s", err.Error()) diff --git a/modules/web/providers/sn/values.go b/modules/web/providers/sn/values.go index 6f4d0ce..46b6c72 100644 --- a/modules/web/providers/sn/values.go +++ b/modules/web/providers/sn/values.go @@ -117,7 +117,7 @@ func GeneratedSignMap(params map[string]interface{}) string { func GeneratedSign(params map[string]interface{}, key string) string { keys := make([]string, 0, len(params)) for k := range params { - if k != "" && k != "sign" && params[k] != nil { + if k != "" && k != "sign" && params[k] != nil && fmt.Sprintf("%v", params[k]) != "" { keys = append(keys, k) } } @@ -134,7 +134,6 @@ func GeneratedSign(params map[string]interface{}, key string) string { data, _ := json.Marshal(params[v]) value = string(data) default: - log.Debug("params[%s]: type=%T, value=%+v", v, params[v], params[v]) value = fmt.Sprintf("%v", params[v]) } sign += v + "=" + value + "&" diff --git a/modules/web/routers/routers_activity.go b/modules/web/routers/routers_activity.go index 36a9c6a..d5a6698 100644 --- a/modules/web/routers/routers_activity.go +++ b/modules/web/routers/routers_activity.go @@ -44,8 +44,6 @@ func activity(e *gin.RouterGroup) { // 首充返还 e.POST("/activity/firstRechargeBack/info", handler.ActivityFirstRechargeBackInfo) e.POST("/activity/firstRechargeBack/draw", handler.ActivityFirstRechargeBackDraw) - e.POST("/activity/weekCard/info", handler.ActivityWeekCardInfo) - e.POST("/activity/weekCard/draw", handler.ActivityWeekCardDraw) // 优惠券 e.POST("/activity/discountTicket/info", handler.DiscountTicketInfo) // 好友冲冲冲 diff --git a/modules/web/routers/routers_weekCard.go b/modules/web/routers/routers_weekCard.go index 4e400b4..26f9ed7 100644 --- a/modules/web/routers/routers_weekCard.go +++ b/modules/web/routers/routers_weekCard.go @@ -6,6 +6,6 @@ import ( ) func weekCard(e *gin.RouterGroup) { - e.POST("/weekCard/info", handler.ActivityWeekCardInfo) - e.POST("/weekCard/draw", handler.ActivityWeekCardDraw) + e.POST("/weekCard/info", handler.WeekCardInfo) + e.POST("/weekCard/draw", handler.WeekCardDraw) }