Merge remote-tracking branch 'origin/master'

rule/one_circles/one_circles_sign_in_green_energy_settlement.go

@@ -60,11 +60,11 @@ func SettlementSignInGreenEnergy(engine *xorm.Engine, masterId string, ch *rabbi
 			ids = append(ids, v.Id)
 		}
 		//6、更新 `one_circles_green_energy_sign_in` 中的 is_completed 状态
-		if len(ids) > 0 {
-			_, err = engine.In("id", ids).Update(&model.OneCirclesGreenEnergySignIn{
-				IsCompleted: 1,
-			})
-		}
+		//if len(ids) > 0 {
+		//	_, err = engine.In("id", ids).Update(&model.OneCirclesGreenEnergySignIn{
+		//		IsCompleted: 1,
+		//	})
+		//}
 		page++
 		time.Sleep(time.Millisecond * time.Duration(rand.Intn(1000)))
 	}
@@ -213,6 +213,11 @@ func HandleSettlementSignInGreenEnergy(engine *xorm.Engine, masterId string, id
 		}
 	}
 
+	//6、更新 `one_circles_green_energy_sign_in` 中的 is_completed 状态
+	_, err = session.Where("id = ?", id).Update(&model.OneCirclesGreenEnergySignIn{
+		IsCompleted: 1,
+	})
+
 	err = session.Commit()
 	if err != nil {
 		_ = session.Rollback()