update

rule/one_circles/one_circles_public_platoon_give_activty_coin.go

@@ -90,7 +90,13 @@ func SettlementPublicGiveActivityCoin(engine *xorm.Engine, masterId string, uid
 			if err2 != nil {
 				return err2
 			}
-			if userCount >= zhios_order_relate_utils.StrToInt64(fatherReward.RewardCondition) {
+			//判断是否活跃
+			var m model.OneCirclesGreenEnergySignIn
+			has, err3 := engine.Where("uid =?", fatherUid).And("end_time <=?", time.Now().Format("2006-01-02 15:04:05")).Get(&m)
+			if err != nil {
+				return err3
+			}
+			if has && userCount >= zhios_order_relate_utils.StrToInt64(fatherReward.RewardCondition) {
 				fatherRewardValue := rewardValue * (zhios_order_relate_utils.StrToFloat64(fatherReward.RewardValue) / 100)
 				rewardFather = append(rewardFather, struct {
 					Uid         int     `json:"uid"`          //用户id