Merge branch 'feature/family' into feature/3.5

domain/model/groupPower_m/group_star.go

@@ -30,6 +30,7 @@ func IncrGroupPowerMonthStarScore(model *domain.Model, groupPowerId, userId mysq
 		UserId:       userId,
 		Type:         _type,
 		Score:        score,
+		LastCalTs:    lastCalTs,
 	}
 	if err := model.DB().Model(GroupPowerMonthStar{}).Clauses(clause.OnConflict{
 		Columns: []clause.Column{{Name: "month"}, {Name: "group_power_id"}, {Name: "user_id"}, {Name: "type"}},

domain/model/mic_m/mic.go

@@ -51,12 +51,13 @@ func IncrUserOnMic(model *domain.Model, userId mysql.ID, joinMicTimestamp int64)
 		score := nowTs - curTs
 		day := time.Now().Format("2006-01-02")
 		onMicNew := &UserOnMic{
-			Date:    day,
-			UserId:  userId,
-			Seconds: mysql.Num(score),
+			Date:      day,
+			UserId:    userId,
+			Seconds:   mysql.Num(score),
+			LastCalTs: nowTs,
 		}
 		if err := model.DB().Model(UserOnMic{}).Clauses(clause.OnConflict{
-			Columns: []clause.Column{{Name: "day"}, {Name: "user_id"}},
+			Columns: []clause.Column{{Name: "date"}, {Name: "user_id"}},
 			DoUpdates: clause.Assignments(map[string]interface{}{
 				"seconds":     gorm.Expr("seconds + ?", onMicNew.Seconds),
 				"last_cal_ts": nowTs,