From eb4b015247152707d97420abbc2973538e4948ea Mon Sep 17 00:00:00 2001
From: zhouhaihai <zhhyf521@163.com>
Date: Mon, 23 Dec 2019 11:57:14 +0800
Subject: [PATCH] 邮件增加 stitle

---
 src/actions/EmailAction.lua    | 1 +
 src/models/Email.lua           | 7 +++++++
 src/rdsscripts/insertEmail.lua | 6 ++++--
 src/services/globald.lua       | 3 ++-
 src/shared/redisproxy.lua      | 5 +++--
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/actions/EmailAction.lua b/src/actions/EmailAction.lua
index df45e91..7d10887 100644
--- a/src/actions/EmailAction.lua
+++ b/src/actions/EmailAction.lua
@@ -49,6 +49,7 @@ function _M.listRpc(agent, data)
 					emailId = 0,
 					createtime = time,
 					title = email.title, 
+					stitle = email.stitle, 
 					content = email.content, 
 					attachments = email.attachments
 				})
diff --git a/src/models/Email.lua b/src/models/Email.lua
index aef1e98..359982d 100644
--- a/src/models/Email.lua
+++ b/src/models/Email.lua
@@ -9,6 +9,7 @@ Email.schema = {
     id 			= {"number", 0},	-- 数据库ID
     emailId		= {"number", 0},	-- 邮件csv ID
     title 		= {"string", ""},	-- 邮件标题
+    stitle		= {"string", ""}, 	-- 小标题
     content 	= {"string", ""},	-- 邮件正文
     attachments	= {"string", ""},
     status		= {"number", 0},	-- 邮件状态: 未读, 已读, 已领取
@@ -20,6 +21,7 @@ Email.schema = {
 function Email:data()
 	local emailId = self:getProperty("emailId")
 	local title = self:getProperty("title")
+	local stitle = self:getProperty("stitle")
 	local content = self:getProperty("content")
 	local attachments = self:getProperty("attachments")
 	local contentPms = self:getProperty("contentPms")
@@ -37,6 +39,10 @@ function Email:data()
 		if title == "" and emailData.title ~= "" then
 			title = emailData.title
 		end
+		
+		if stitle == "" and emailData.subtitle ~= "" then
+			stitle = emailData.subtitle
+		end
 
 		if attachments == "" and emailData.attachment ~= "" then
 			attachments = emailData.attachment:format(table.unpack(rewardPms))
@@ -48,6 +54,7 @@ function Email:data()
 		status = self:getProperty("status"),
 		createtime = self:getProperty("createtime"),
 		title = title,
+		stitle = stitle,
 		content = content,
 		attachments = attachments,
 	}
diff --git a/src/rdsscripts/insertEmail.lua b/src/rdsscripts/insertEmail.lua
index c111fde..fd530b0 100644
--- a/src/rdsscripts/insertEmail.lua
+++ b/src/rdsscripts/insertEmail.lua
@@ -5,8 +5,9 @@ local createTime = KEYS[4]
 local con = KEYS[5] or cmsgpack.pack({})
 local att = KEYS[6] or cmsgpack.pack({})
 local title = KEYS[7] or ""
-local content = KEYS[8] or ""
-local attachments = KEYS[9] or ""
+local stitle = KEYS[8] or ""
+local content = KEYS[9] or ""
+local attachments = KEYS[10] or ""
 
 
 -- local roleInfo = redis.call("HGET", string.format("role:%d", roleId), "delete")
@@ -29,6 +30,7 @@ redis.call("HMSET", string.format("email:%d:%d", roleId, id),
 	"contentPms", con, 
 	"rewardPms", att, 
 	"title", title, 
+	"stitle", stitle, 
 	"content", content, 
 	"attachments", attachments
 )
diff --git a/src/services/globald.lua b/src/services/globald.lua
index 08bead6..bf120ea 100644
--- a/src/services/globald.lua
+++ b/src/services/globald.lua
@@ -63,6 +63,7 @@ local function mailQuene()
 				"id", gid,
 				"createtime", email.endTime,
 				"title", email.title,
+				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
@@ -73,7 +74,7 @@ local function mailQuene()
 			redisproxy:hmset(string_format("globalEmail:%s", gid), 
 				"id", gid,
 				"createtime", email.endTime,
-				"title", email.title,
+				"stitle", email.stitle,
 				"content", email.content,
 				"attachments", email.attachments,
 				"endtime", email.endTime,
diff --git a/src/shared/redisproxy.lua b/src/shared/redisproxy.lua
index 884d43a..a330bf1 100644
--- a/src/shared/redisproxy.lua
+++ b/src/shared/redisproxy.lua
@@ -54,12 +54,13 @@ function redisproxy:insertEmail(params)
 		con = params.con or {},
 		att = params.att or {},
 		title = params.title or "",
+		stitle = params.stitle or "",
 		content = params.content or "",
 		attachments = params.attachments or "",
 	}
-	self:runScripts("insertEmail", 9, EMAIL_LIMIT,
+	self:runScripts("insertEmail", 10, EMAIL_LIMIT,
 		pms.roleId, pms.emailId, pms.createtime,
-		MsgPack.pack(pms.con), MsgPack.pack(pms.att), pms.title, pms.content, pms.attachments)
+		MsgPack.pack(pms.con), MsgPack.pack(pms.att), pms.title, pms.stitle, pms.content, pms.attachments)
 	return true
 end
 
--
libgit2 0.21.2