活动礼包购买记录活动过期清理

liuzujun
1 parent 8e892c71
Showing 4 changed files with 21 additions and 3 deletions Show diff stats
src/GlobalVar.lua
src/csvdata
src/models/Activity.lua
src/models/RolePlugin.lua
@@ -292,6 +292,10 @@ CardType = {
 	BattlePassCard = 7, -- 探索指令
 }
  
+ShopPackType = {
+	ActShopPack = 5,	-- 活动礼包
+}
+
 HeroQuality = {
 	N = 1,
 	R = 2,
-Subproject commit 3c3215a04ace7ebcb57dbb405f2fda22dc551615
+Subproject commit 0cec95763804e1c8aca85f752732913423b8a18d
@@ -705,5 +705,19 @@ function Activity:getBattleTicket(actId)
 	end
 end
  
+activityFunc[Activity.ActivityType.ActShopGoods] = {
+	["init"] = function(self, actType, isCrossDay, notify, actId)
+	end,
+	["close"] = function(self, actType, notify)
+		local rechargeRecord = self.owner.storeData:getProperty("payR")
+		for id, cfg in pairs(csvdb["shop_rechargeCsv"]) do
+			if cfg.shop == 3 and cfg.type == ShopPackType.ActShopPack then
+				rechargeRecord[id] = nil
+			end
+		end
+		self.owner.storeData:updateProperty({field="payR", value=rechargeRecord})
+	end,
+}
+
  
 return Activity
@@ -1582,9 +1582,9 @@ function RolePlugin.bind(Role)
 		end
  
 		--判断是否是活动商品
-		local actCfg = csvdb["activity_ctrlCsv"][rechargeData.actid]
+		local actCfg = csvdb["activity_ctrlCsv"][rechargeData.activity_id]
 		if not actCfg then return "" end
-		if not self.activity:isOpenById(rechargeData.actid, "ActShopGoods") then return "" end
+		if not self.activity:isOpenById(rechargeData.activity_id, "ActShopGoods") then return "" end
  
 	    local orderId = redisproxy:hget(string.format(R_ORDERS, roleId), rechargeId)
 	    if orderId then