充值返利邮件新增

测试
1 parent 1be37174
Showing 4 changed files with 6 additions and 5 deletions Show diff stats
src/GlobalVar.lua
src/csvdata
src/models/Activity.lua
src/models/Email.lua
@@ -293,8 +293,6 @@ MailId = {
 	SuperMonthCardEx = 204,
 	BattleCardAward = 210,
  
-	PaySignAward = 222,
-
 	ActSellFood = 231,
 	ActDrawCard = 232,
 	ActAdvDraw = 233,
@@ -303,6 +301,9 @@ MailId = {
 	ActDrawCardReward = 222,
 	ActAdvDrawReward = 223,
 	ActOpenBoxReward = 224,
+
+	PaySignAward = 241,
+	PayBackAward = 242,
 }
  
 TriggerEventType = {
-Subproject commit 9ce6c8d165817a183c2867c4e7dca9d6a5600669
+Subproject commit 5751e98613ad7ade246cb9068c6752ecca115163
@@ -334,7 +334,7 @@ activityFunc[Activity.ActivityType.PayBack] = {
 		local newVal = oldVal + twd
 		local gift = self.owner:getPaybackReward(oldVal, newVal)
 		if gift ~= "" then
-			self.owner:sendMail(MailId.MonthCard, nil, gift)
+			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal})
 		end
 		self:updateActData(actType, newVal, not notify)
 	end,
@@ -49,7 +49,7 @@ function Email:data()
 	if emailData then
 		-- 如果内容是直接插入到数据库
 		if content == "" and emailData.body ~= "" then
-			content = io.readfile("src/" .. emailData.body)
+			content = io.readfile("src/" .. emailData.body) or ""
 			content = content:format(table.unpack(contentPms))
 		end