From 4709685d007e204489faeb753ff334de91744a82 Mon Sep 17 00:00:00 2001
From: liuzujun <307836273@qq.com>
Date: Wed, 16 Sep 2020 21:22:24 +0800
Subject: [PATCH] 返利邮件拼接充值档位

---
 src/models/Activity.lua   |  5 +++--
 src/models/RolePlugin.lua | 11 +++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/models/Activity.lua b/src/models/Activity.lua
index 91bed44..5a82ef7 100644
--- a/src/models/Activity.lua
+++ b/src/models/Activity.lua
@@ -348,9 +348,10 @@ activityFunc[Activity.ActivityType.PayBack] = {
 	["check"] = function(self, actType, notify, twd) -- 检查
 		local oldVal = self:getActData(actType) or 0
 		local newVal = oldVal + twd
-		local gift = self.owner:getPaybackReward(oldVal, newVal)
+		local gift, checkPoint = self.owner:getPaybackReward(oldVal, newVal)
 		if gift ~= "" then
-			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal})
+			local strCp = table.concat(checkPoint ,"/")
+			self.owner:sendMail(MailId.PayBackAward, nil, gift, {newVal, strCp})
 		end
 		self:updateActData(actType, newVal, not notify)
 	end,
diff --git a/src/models/RolePlugin.lua b/src/models/RolePlugin.lua
index 8d3eb0b..a1dd7b9 100644
--- a/src/models/RolePlugin.lua
+++ b/src/models/RolePlugin.lua
@@ -1704,6 +1704,7 @@ function RolePlugin.bind(Role)
 	function Role:getPaybackReward(oldVal, newVal)
 		local maxVal, diff, extraReward = 0, 0, ""
 		local gift = ""
+		local checkPoint = {}
 		for k, v in pairs(csvdb["rebateCsv"]) do
 			if k > maxVal then
 				maxVal = k
@@ -1714,21 +1715,27 @@ function RolePlugin.bind(Role)
 			end
 			if oldVal < k and newVal > k then
 				gift = gift .. v.reward .. " "
+
+				table.insert(checkPoint, k)
 			end
 		end
 		if newVal > maxVal then
 			local cnt = 0
+			local oldCheckPoint = 0
 			if oldVal < maxVal then
 				cnt = math.floor((newVal - maxVal) / diff)
+				oldCheckPoint = maxVal
 			else
 				cnt = math.floor((newVal - maxVal) / diff) - math.floor((oldVal - maxVal) / diff)
+				oldCheckPoint = maxVal + math.floor((oldVal - maxVal) / diff) * diff
 			end
 			for i = 1, cnt do
 				gift = gift .. extraReward .. " "
+
+				table.insert(checkPoint, oldCheckPoint + i * diff)
 			end
 		end
-
-		return gift
+		return gift, checkPoint
 	end
 
 end
--
libgit2 0.21.2