Merge branch 'cn/develop' into cn/publish/preview

jiyue
2 parents 6f372cc2 814d9753
Showing 2 changed files with 10 additions and 3 deletions Show diff stats
src/actions/RoleAction.lua
src/models/Store.lua
@@ -445,9 +445,16 @@ function _M.createRpc(agent, data)
 	end
 	newRole:log("onCreateRole")
 	newRole:mylog("create", {key1 = agent.ip:toArray(false, ":")[1]})
-	if msg.newdevice then
-		newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+
+	-- 是否是新设备
+	local deviced = cluster.query("center", "deviced")
+	if deviced then
+		local status, back = pcall(cluster.call, "center", deviced, "isNewDevice", {device = msg.device})
+		if status and back  then
+			newRole:mylog("newdevice", {key1 = agent.ip:toArray(false, ":")[1]})
+		end
 	end
+
 	-- 整体保存一次
 	newRole:update()
@@ -867,7 +867,7 @@ function Store:data()
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
         firstMonthCard = self:getProperty("firstMonthCard"),
-        firstsMonthCard = self:getProperty("firstsMonthCard"),
+        firstSMonthCard = self:getProperty("firstSMonthCard"),
         monthCardReceive = self:getProperty("monthCardReceive"),
         smonthCards  = self:getProperty("smonthCards"),
         smonthCardReceive  = self:getProperty("smonthCardReceive"),