diff --git a/src/models/RoleTimeReset.lua b/src/models/RoleTimeReset.lua
index f8f601d..28def0c 100644
--- a/src/models/RoleTimeReset.lua
+++ b/src/models/RoleTimeReset.lua
@@ -85,6 +85,7 @@ ResetFunc["CrossWeek"] = function(self, notify, response)
 	response.dinerS = {}
 
 	self.activity:refreshWeekData(notify)
+	self.storeData:refreshWeekData(notify)
 
 	-- 跨周送一些道具
 	local BnousReward = self:getBnousPvpTicket()
diff --git a/src/models/Store.lua b/src/models/Store.lua
index 2985888..1605b06 100644
--- a/src/models/Store.lua
+++ b/src/models/Store.lua
@@ -52,6 +52,9 @@ Store.schema = {
     bpInfo = {"table", {}},         -- battle pass 探索指令  1={flag=0 为1表示买了，br=""付费领取记录, fr=""免费领取记录},2,3,4
     
     totalRR  = {"string", ""},        -- 累计充值奖励领取记录
+
+    dailyShop = {"table", {}},
+    weekShop = {"table", {}},
 }
 
 function Store:updateProperty(params)
@@ -77,6 +80,17 @@ function Store:onCrossDay()
     --self:sendMonthCardEmail()
     self:deleteExpireLimitGoods()
     --self:checkPaySignReward()
+
+    --刷新商店
+    self:flushDailyShop()
+
+    --重置月卡、特刊奖励领取记录
+    self:updateProperty({field = "monthCardReceive", value = 0})
+    self:updateProperty({field = "smonthCardReceive", value = 0})
+end
+
+function Store:refreshWeekData(notify)
+    self:flushWeekShop()
 end
 
 local SuperMonthCard = {}
@@ -690,6 +704,88 @@ function Store:OnTriggerLimitTimePackAfterTs(eventType, param)
     end
 end
 
+local function checkShopFinish(shop, shopPool)
+    local tmpShop = shopPool[shop.id] or {}
+    if next(tmpShop) then
+        if tmpShop.expire_ts then
+            if skynet.timex() > tmpShop.expire_ts then
+                shopPool[shop.id] = nil
+                return true
+            else
+                return false
+            end
+        else
+            tmpShop.expire_ts = skynet.timex() + tmpShop.cool_time * DAY_SEC
+            return false
+        end
+    else
+        return true
+    end
+end
+
+--随机日/周商店随机两个商品
+-- 1. 让缓存里的商品进入冷却时间
+-- 2. 删除缓存里的已经冷却好的商品
+-- 3. 随机两件商品放入缓存中
+function Store:flushDailyShop()
+    local dailyShop = self:getProperty("dailyShop") or {}
+    local tmpDailyShop = {}
+
+    for id, data in pairs(csvdb["shop_normalCsv"]) do
+        if data.shop == 1 and data.shopType == 3 then
+            if data.resetTime == 1 and checkShopFinish(data, dailyShop) then
+                tmpDailyShop[id] = {["id"] = data.id, ["weight"] = 100, ["cool_time"] = data.cool_time}
+            end
+        end
+    end
+
+    --随机两件商品放入缓存 跨天刷新
+    if next(tmpDailyShop) then
+        local id = math.randWeight(tmpDailyShop)
+        if id then
+            dailyShop[id] = tmpDailyShop[id]
+            tmpDailyShop[id] = nil
+        end
+
+        id = math.randWeight(tmpDailyShop)
+        if id then
+            dailyShop[id] = tmpDailyShop[id]
+            tmpDailyShop[id] = nil
+        end
+    end
+
+    self:updateProperty({field="dailyShop", value= dailyShop})
+end
+
+function Store:flushWeekShop()
+    local weekShop = self:getProperty("weekShop") or {}
+    local tmpWeekShop = {}
+
+    for id, data in pairs(csvdb["shop_normalCsv"]) do
+        if data.shop == 1 and data.shopType == 3 then
+            if data.resetTime == 2 and checkShopFinish(data, weekShop)then
+                tmpWeekShop[id] = {["id"] = data.id, ["weight"] = 100, ["cool_time"] = data.cool_time}
+            end
+        end
+    end
+
+    --随机两件商品放入缓存 跨周刷新
+    if next(tmpWeekShop) then
+        local id = math.randWeight(tmpWeekShop)
+        if id then
+            weekShop[id] = weekShop[id]
+            tmpWeekShop[id] = nil
+        end
+
+        id = math.randWeight(tmpWeekShop)
+        if id then
+            weekShop[id] = weekShop[id]
+            tmpWeekShop[id] = nil
+        end
+    end
+    self:updateProperty({field="weekShop", value= weekShop})
+end
+
 function Store:data()
     self:OnTriggerLimitTimePackAfterTs(TriggerEventType.AfterTs, skynet.timex())
 	return {
@@ -708,7 +804,10 @@ function Store:data()
         bpInfo = self:getProperty("bpInfo"),
         totalRR = self:getProperty("totalRR"),
         monthCardId  = self:getProperty("monthCardId"),
-        smonthCardId  = self:getProperty("smonthCardId"),
+        smonthCards  = self:getProperty("smonthCards"),
+        smonthCardReceive  = self:getProperty("smonthCardReceive"),
+        dailyShop  = self:getProperty("dailyShop"),
+        weekShop  = self:getProperty("weekShop"),
 	}
 end
 
--
libgit2 0.21.2