update 一个圈圈

rule/one_circles/one_circles_public_platoon_give_activty_coin.go

@@ -85,6 +85,16 @@ func SettlementPublicGiveActivityCoin(engine *xorm.Engine, masterId string, uid
 
 			fatherUid := zhios_order_relate_utils.IntToStr(tmpOneCirclesPublicPlatoonUserRelation.Uid)
 			fatherReward := rewardSystemMap[k+1]
+			//判断是否活跃
+			var m model.OneCirclesGreenEnergySignIn
+			has, err33 := engine.Where("uid =?", fatherUid).And("start_time >=?", time.Now().Format("2006-01-02")+"00:00:00").Get(&m)
+			if err33 != nil {
+				return err33
+			}
+			if !has {
+				//不活跃不需要奖励
+				continue
+			}
 			//判断是否满足奖励条件
 			userCount, _, err2 := db.SumUserRelateByParentUid(engine, fatherUid)
 			if err2 != nil {

rule/one_circles/one_circles_sign_in_green_energy_settlement.go

@@ -100,9 +100,9 @@ func SettlementSignInGreenEnergy(engine *xorm.Engine, masterId string) (err erro
 				if parentRewardValue <= rewardEndValue {
 					break
 				}
-				//判断是否活跃
+				//TODO::判断是否活跃
 				var m model.OneCirclesGreenEnergySignIn
-				has, err3333333 := engine.Where("uid =?", relate.ParentUid).And("end_time >=?", time.Now().Format("2006-01-02 15:04:05")).Get(&m)
+				has, err3333333 := engine.Where("uid =?", relate.ParentUid).And("start_time >=?", time.Now().Format("2006-01-02")+"00:00:00").Get(&m)
 				if err3333333 != nil {
 					_ = session.Rollback()
 					fmt.Println("err:::::3333333", err3333333)