Merge branch 'fix/family_month_rank' into 'master'

Fix/family month rank

See merge request !32

cron/group_cron/group_power_month_act.go

@@ -23,7 +23,7 @@ func GroupPowerMonthRankAct() {
 
 func BufaGroupPowerMonthRankAct() {
 	c := cron.New()
-	spec := "0 4 15 1 * ?"
+	spec := "0 28 15 1 * ?"
 	_ = c.AddFunc(spec, func() {
 		var model = domain.CreateModelNil()
 		if err := group_power_s.BufaCalcGroupPowerMonthRankAct(model); err != nil {

domain/service/group_power_s/group_power.go

@@ -255,7 +255,7 @@ func DoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, end
 }
 
 func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate, endDate, starDate string) error {
-	areaList := []int{1, 2}
+	areaList := []int{2}
 	for _, area := range areaList { // 计算获奖
 		model := domain.CreateModelContext(model.MyContext)
 		response, err := GetGroupPowerRankResp(model, beginDate, endDate, 0, groupPower_e.GroupPowerUserHas, area)
@@ -276,12 +276,10 @@ func BufaDoCalcGroupPowerMonthRankAct(model *domain.Model, calcMonth, beginDate,
 			return err
 		}
 
-		//if area == 1 {
+		//if area == 2 {
 		//	for _, v := range logList {
-		//		if v.RankUser == 1 {
 		//		model.Log.Infof("bufajiangli award:%+v", v)
 		//	}
-		//	}
 		//}
 
 		err = model.Transaction(func(model *domain.Model) error {
@@ -454,7 +452,7 @@ func bufaGetAwardAndLogList(model *domain.Model, powerIds []uint64, items []grou
 		//	HeaddressDuration: oAward.HeaddressDay})
 		// 家族成员奖励
 		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
 			}
 			uRank := i + 1