Merge remote-tracking branch 'origin/master'

rule/one_circles/one_circles_public_platoon_give_activty_coin.go

@@ -101,7 +101,7 @@ func SettlementPublicGiveActivityCoin(engine *xorm.Engine, masterId string, uid
 				return err2
 			}
 
-			if userCount >= zhios_order_relate_utils.StrToInt64(fatherReward.RewardCondition) {
+			if fatherReward != nil && 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