diff --git a/server/adminserver/api/v1/system/announcement.go b/server/adminserver/api/v1/system/announcement.go index 1c796a5f..d1846e4f 100644 --- a/server/adminserver/api/v1/system/announcement.go +++ b/server/adminserver/api/v1/system/announcement.go @@ -221,10 +221,10 @@ func (this *AnncApi) AddIngameAnnc(c *gin.Context) { annc.Uniid = uint64(f5.GetApp().NewNodeUuid()) nowDaySeconds := int32(f5.GetApp().GetRealSeconds()) - annc.BeginTime = getTimeSeconds(annc.BeginTime) - annc.EndTime = getTimeSeconds(annc.EndTime) - annc.BeginDate = getUtcDaysSeconds(annc.BeginDate) - annc.EndDate = getUtcDaysSeconds(annc.EndDate) + annc.BeginTime = int32(int64(annc.BeginTime) - q5.GetDaySeconds(int64(annc.BeginTime), 0)) + annc.EndTime = int32(int64(annc.EndTime) - q5.GetDaySeconds(int64(annc.EndTime), 0)) + annc.BeginDate = int32(q5.GetDaySeconds(int64(annc.BeginDate), 0)) + annc.EndDate = int32(q5.GetDaySeconds(int64(annc.EndDate), 0)) annc.CreateTime = nowDaySeconds annc.ModifyTime = nowDaySeconds err := f5.GetApp().GetOrmDb(constant.CONF_DB).Create(&annc).Error @@ -328,7 +328,8 @@ func (this *AnncApi) CheckIngameAnnc(annc system.IngameAnnc, c *gin.Context) boo // return false // } - if getUtcDaysSeconds(annc.EndDate) < getUtcDaysSeconds(annc.BeginDate) || getUtcDaysSeconds(annc.EndDate) < getUtcDaysSeconds(int32(notsecs)) { + if q5.GetDaySeconds(int64(annc.EndDate), 0) < q5.GetDaySeconds(int64(annc.BeginDate), 0) || + q5.GetDaySeconds(int64(annc.EndDate), 0) < q5.GetDaySeconds(int64(notsecs), 0) { c.JSON(http.StatusOK, gin.H{ "code": 2, "message": "发送日期不对", @@ -338,11 +339,3 @@ func (this *AnncApi) CheckIngameAnnc(annc system.IngameAnnc, c *gin.Context) boo return true } - -func getUtcDaysSeconds(ts int32) int32 { - return ts / 3600 / 24 * 3600 * 24 -} - -func getTimeSeconds(ts int32) int32 { - return ts - ts/3600/24*3600*24 -}