From fbf01a1ed3bada034f067ff74ea2f733f3ea75be Mon Sep 17 00:00:00 2001
From: chenweijian <820961417@qq.com>
Date: Thu, 20 Apr 2023 10:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E8=B4=A1=E7=8C=AE=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E8=87=AA=E5=8A=A8=E5=8F=91=E5=A5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 domain/service/group_power_s/group_power.go | 34 +++++++++++----------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/domain/service/group_power_s/group_power.go b/domain/service/group_power_s/group_power.go
index e3f3d92..0cdc157 100644
--- a/domain/service/group_power_s/group_power.go
+++ b/domain/service/group_power_s/group_power.go
@@ -271,11 +271,13 @@ func getAwardAndLogList(model *domain.Model, powerIds []uint64, items []group_po
 			Award:      string(oAwardJ),
 		})
 		awardList = append(awardList, &award_tx.UserAward{
-			MedalId:       oAward.MedalId,
-			MedalDuration: oAward.MedalDay,
-			Diamond:       oAward.Diamond,
-			NobleLevel:    oAward.Noble,
-			NobleDuration: oAward.NobleDay})
+			MedalId:           oAward.MedalId,
+			MedalDuration:     oAward.MedalDay,
+			Diamond:           oAward.Diamond,
+			NobleLevel:        oAward.Noble,
+			NobleDuration:     oAward.NobleDay,
+			HeaddressId:       oAward.HeaddressId,
+			HeaddressDuration: oAward.HeaddressDay})
 		// 家族成员奖励
 		for i, m := range v.StarList {
 			uRank := i + 1
@@ -325,23 +327,23 @@ type awardConf struct {
 func CalcGroupPowerMonthRankActConf() map[int]map[int]*awardConf {
 	return map[int]map[int]*awardConf{
 		1: {
-			0: {MedalId: 1, MedalDay: 30, Diamond: 300000, Noble: 5, NobleDay: 15},
-			1: {MedalId: 1, MedalDay: 30, Diamond: 100000, Noble: 5, NobleDay: 7},
-			4: {HeaddressId: 1, HeaddressDay: 30},
+			0: {MedalId: 5211, MedalDay: 30, Diamond: 300000, Noble: 5, NobleDay: 15},
+			1: {MedalId: 5251, MedalDay: 30, Diamond: 100000, Noble: 5, NobleDay: 7, HeaddressId: 2121, HeaddressDay: 30},
+			4: {HeaddressId: 2121, HeaddressDay: 30},
 		},
 		2: {
-			0: {MedalId: 1, MedalDay: 30, Diamond: 200000, Noble: 4, NobleDay: 15},
-			1: {MedalId: 1, MedalDay: 30, Diamond: 80000, Noble: 4, NobleDay: 7},
-			4: {HeaddressId: 1, HeaddressDay: 30},
+			0: {MedalId: 5221, MedalDay: 30, Diamond: 200000, Noble: 4, NobleDay: 15},
+			1: {MedalId: 5261, MedalDay: 30, Diamond: 80000, Noble: 4, NobleDay: 7, HeaddressId: 2131, HeaddressDay: 30},
+			4: {HeaddressId: 2131, HeaddressDay: 30},
 		},
 		3: {
-			0: {MedalId: 1, MedalDay: 30, Diamond: 100000, Noble: 5, NobleDay: 5},
-			1: {MedalId: 1, MedalDay: 30, Diamond: 50000},
-			4: {HeaddressId: 1, HeaddressDay: 30},
+			0: {MedalId: 5231, MedalDay: 30, Diamond: 100000, Noble: 5, NobleDay: 5},
+			1: {MedalId: 5271, MedalDay: 30, Diamond: 50000, HeaddressId: 2141, HeaddressDay: 30},
+			4: {HeaddressId: 2141, HeaddressDay: 30},
 		},
 		4: {
-			0: {MedalId: 1, MedalDay: 30},
-			1: {MedalId: 1, MedalDay: 30, HeaddressId: 1, HeaddressDay: 30},
+			0: {MedalId: 5241, MedalDay: 30},
+			1: {MedalId: 5281, MedalDay: 30, HeaddressId: 2151, HeaddressDay: 30},
 		},
 	}
 }
-- 
2.22.0