Commit 69f225f6 authored by chenweijian's avatar chenweijian

Fix/family month rank

parent 11e151e3
...@@ -23,7 +23,7 @@ func GroupPowerMonthRankAct() { ...@@ -23,7 +23,7 @@ func GroupPowerMonthRankAct() {
func BufaGroupPowerMonthRankAct() { func BufaGroupPowerMonthRankAct() {
c := cron.New() c := cron.New()
spec := "0 4 15 1 * ?" spec := "0 28 15 1 * ?"
_ = c.AddFunc(spec, func() { _ = c.AddFunc(spec, func() {
var model = domain.CreateModelNil() var model = domain.CreateModelNil()
if err := group_power_s.BufaCalcGroupPowerMonthRankAct(model); err != nil { if err := group_power_s.BufaCalcGroupPowerMonthRankAct(model); err != nil {
......
...@@ -255,7 +255,7 @@ func DoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, end ...@@ -255,7 +255,7 @@ func DoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, end
} }
func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, endDate, starDate string) error { func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, endDate, starDate string) error {
areaList := []int{1, 2} areaList := []int{2}
for _, area := range areaList { // 计算获奖 for _, area := range areaList { // 计算获奖
model := domain.CreateModelContext(model.MyContext) model := domain.CreateModelContext(model.MyContext)
response, err := GetGroupPowerRankResp(model, beginDate, endDate, 0, groupPower_e.GroupPowerUserHas, area) response, err := GetGroupPowerRankResp(model, beginDate, endDate, 0, groupPower_e.GroupPowerUserHas, area)
...@@ -276,12 +276,10 @@ func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, ...@@ -276,12 +276,10 @@ func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate,
return err return err
} }
//if area == 1 { //if area == 2 {
// for _, v := range logList { // for _, v := range logList {
// if v.RankUser == 1 {
// model.Log.Infof("bufajiangli award:%+v", v) // model.Log.Infof("bufajiangli award:%+v", v)
// } // }
// }
//} //}
err = model.Transaction(func(model *domain.Model) error { err = model.Transaction(func(model *domain.Model) error {
...@@ -454,7 +452,7 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou ...@@ -454,7 +452,7 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou
// HeaddressDuration: oAward.HeaddressDay}) // HeaddressDuration: oAward.HeaddressDay})
// 家族成员奖励 // 家族成员奖励
for i, m := range v.StarList { for i, m := range v.StarList {
if m.User.Id == 5343751 || m.User.Id == 1180791 { if m.User.Code == "1217599" || m.User.Id == 1180791 {
continue continue
} }
uRank := i + 1 uRank := i + 1
......
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