diff --git a/cron/group_cron/group_power_month_act.go b/cron/group_cron/group_power_month_act.go index a9ed7149105bd2d1d892cce63b43cf21761d63f2..f60ee22a441055a94ddc5a275e8ee511736ea0a1 100644 --- a/cron/group_cron/group_power_month_act.go +++ b/cron/group_cron/group_power_month_act.go @@ -23,7 +23,7 @@ func GroupPowerMonthRankAct() { func BufaGroupPowerMonthRankAct() { c := cron.New() - spec := "0 28 15 1 * ?" + spec := "0 50 15 1 * ?" _ = c.AddFunc(spec, func() { var model = domain.CreateModelNil() if err := group_power_s.BufaCalcGroupPowerMonthRankAct(model); err != nil { diff --git a/domain/service/group_power_s/group_power.go b/domain/service/group_power_s/group_power.go index c7c73a87ad63fda921d20cd89e13fb493b15911a..4987ae4739366424240b3fe778005a65d367a111 100644 --- a/domain/service/group_power_s/group_power.go +++ b/domain/service/group_power_s/group_power.go @@ -272,16 +272,11 @@ func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, } // 奖励、日志 awardList, logList, err := bufaGetAwardAndLogList(model, powerIds, response.Items, calcMonth, area) + //_, _, err = bufaGetAwardAndLogList(model, powerIds, response.Items, calcMonth, area) if err != nil { return err } - //if area == 2 { - // for _, v := range logList { - // model.Log.Infof("bufajiangli award:%+v", v) - // } - //} - err = model.Transaction(func(model *domain.Model) error { // log err = groupPower_m.CreateActFamilyMonthRankLog(model, logList) @@ -452,9 +447,6 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou // HeaddressDuration: oAward.HeaddressDay}) // 家族成员奖励 for i, m := range v.StarList { - if m.User.Code == "1217599" || m.User.Id == 1180791 { - continue - } uRank := i + 1 confIdx := 9 if uRank >= 1 && uRank <= 3 { @@ -462,6 +454,9 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou } else if uRank >= 4 && uRank <= 10 { confIdx = 4 } + if v.Id == 2481 && uRank == 1 { + continue + } mAward, aOk := uRankConfMap[confIdx] if !aOk { break