diff --git a/rule/egg_energy/give_activty_coin.go b/rule/egg_energy/give_activty_coin.go index 23a24b4..578ef38 100644 --- a/rule/egg_energy/give_activty_coin.go +++ b/rule/egg_energy/give_activty_coin.go @@ -209,10 +209,10 @@ func SettlementGiveActivityCoin(engine *xorm.Engine, user model.User, ecpm strin return } fatherRewardValue := rewardValue * (egg_system_rules.StrToFloat64(directPushRewardSetting.RewardRateValue) / 100) + var fatherSign model.EggSignIn if directPushRewardSetting.MemberSelfIsOpenGetTeamReward == "1" { fmt.Println("user:::::::::::::", user) - var m model.EggSignIn - has, err44 := engine.Where("uid =?", user.ParentUid).And("end_time >=?", time.Now().Format("2006-01-02 15:04:05")).Get(&m) + has, err44 := engine.Where("uid =?", user.ParentUid).And("end_time >=?", time.Now().Format("2006-01-02 15:04:05")).Get(&fatherSign) if err44 != nil { return rewardValue, err44 } @@ -279,6 +279,8 @@ func SettlementGiveActivityCoin(engine *xorm.Engine, user model.User, ecpm strin AssistanceUid: uid, Uid: vv.Uid, AssistanceValue: vv.RewardValue, + SignStart: fatherSign.StartTime, + SignEnd: fatherSign.EndTime, }, md2.EggEnergyTeamAssistance) } } diff --git a/rule/egg_energy/md/mq_egg_energy.go b/rule/egg_energy/md/mq_egg_energy.go index 2fd8e78..c2ddd54 100644 --- a/rule/egg_energy/md/mq_egg_energy.go +++ b/rule/egg_energy/md/mq_egg_energy.go @@ -18,6 +18,8 @@ type EggEnergyTeamAssistanceReq struct { Uid int64 `json:"uid"` AssistanceUid int64 `json:"assistance_uid"` AssistanceValue float64 `json:"assistance_value"` + SignStart string `json:"sign_start"` + SignEnd string `json:"sign_end"` } type EggEnergyStructForSignIn struct {