1

bin/matchserver/config/config.json

@@ -5,5 +5,5 @@
   "game_start_notify_time": 20,
   "delay_delete_time": 60,
   "match_real_player": 1,
-  "circuit_mode_interval_time": 120
+  "circuit_mode_interval_time": 0
 }

server/backtask/task/recharge.go

@@ -64,6 +64,11 @@ func (this *recharge) deliverGoods(ds *f5.DataSet) bool {
 		userIdentity = passportAddress
 		accountId = service.GetAccountIdByAddress(passportAddress)
 	}
+	if returnContribution > 0.0 {
+		if this.returnContribution(netId, shortOrderId, userIdentity, returnContribution, payTime) != nil {
+			return true
+		}
+	}
 	if accountId == "" {
 		return true
 	}
@@ -73,11 +78,6 @@ func (this *recharge) deliverGoods(ds *f5.DataSet) bool {
 	if this.markOk(idx, accountId) != nil {
 		return true
 	}
-	if returnContribution > 0.0 {
-		if this.returnContribution(netId, shortOrderId, userIdentity, returnContribution, payTime) != nil {
-			return true
-		}
-	}
 	service.UserAddDiamond(accountId, diamond, netId, orderId)
 	return true
 }

server/mailserver/player/player.go

@@ -77,13 +77,16 @@ func (this *player) MarkMails(mails []common.Mail) error {
 				mi.expireTime = m.GetExpireTime()
 				this.inboxHash[mi.mailId] = mi
 			} else if mi.state != constant.INBOX_STATE_NONE {
-				err := model.Inbox.Mark(this.GetAccountId(), m.GetMailId(), nowTime, m.GetExpireTime())
-				if err != nil {
-					resultErr = err
-					break
+				if mi.state != constant.INBOX_STATE_DELETED &&
+					mi.state != constant.INBOX_STATE_RECEIVED {
+					err := model.Inbox.Mark(this.GetAccountId(), m.GetMailId(), nowTime, m.GetExpireTime())
+					if err != nil {
+						resultErr = err
+						break
+					}
+					mi.state = constant.INBOX_STATE_READ
+					mi.expireTime = m.GetExpireTime()
 				}
-				mi.state = constant.INBOX_STATE_READ
-				mi.expireTime = m.GetExpireTime()
 			}
 		}
 	}