From 926b00a6911c4528afced1a11b4c067f4cdb7c19 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Thu, 12 Dec 2019 13:35:58 +0800
Subject: [PATCH] =?UTF-8?q?Task=E3=80=90ID1005229=E3=80=91=E3=80=90?=
 =?UTF-8?q?=E7=89=B9=E6=9D=83=E8=B0=83=E6=95=B4=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java    | 5 +++++
 .../main/java/com/ljsd/jieling/logic/store/StoreLogic.java   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java
index 3310b9d70..c2e639b26 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java
@@ -7,6 +7,7 @@ import com.ljsd.jieling.handler.BaseHandler;
 import com.ljsd.jieling.logic.dao.PlayerManager;
 import com.ljsd.jieling.logic.dao.UserManager;
 import com.ljsd.jieling.logic.dao.root.User;
+import com.ljsd.jieling.logic.store.GiftGoodsType;
 import com.ljsd.jieling.network.session.ISession;
 import com.ljsd.jieling.protocols.CommonProto;
 import com.ljsd.jieling.protocols.MessageTypeProto;
@@ -33,6 +34,10 @@ public class VipTakeDailyHandler extends BaseHandler<PlayerInfoProto.VipTakeDily
             throw new ErrorCodeException(ErrorCode.CFG_NULL);
         }
 
+         if(playerInfoManager.getRechargeInfo().getBuyGoodsTimes().containsKey(GiftGoodsType.LUXURYMONTHCARD)){
+             throw new ErrorCodeException(ErrorCode.newDefineCode("未激活豪华月卡"));
+         }
+
         if(playerInfoManager.getHadTakeDailyBoxVip() != -1 ){
             throw new ErrorCodeException(ErrorCode.newDefineCode("had taked the vip daily reward"));
         }
diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java
index 35d046aef..d8c2f3f2b 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/StoreLogic.java
@@ -420,7 +420,7 @@ public class StoreLogic {
 
         if(storeId==Global.VIPSTORID){
             int vipLeve = user.getPlayerInfoManager().getVipLevel();
-            user.getPlayerInfoManager().getHadTakeLevelBoxVip().add(vipLeve);
+            user.getPlayerInfoManager().setHadTakeLevelBoxVip(vipLeve);
         }
 
         PlayerInfoProto.BuyStoreItemResponse builder = PlayerInfoProto.BuyStoreItemResponse.newBuilder().setDrop(drop).build();
@@ -443,7 +443,7 @@ public class StoreLogic {
 
         if(storeId==Global.VIPSTORID){
             int vipLeve = user.getPlayerInfoManager().getVipLevel();
-            if(vipLeve<(sStoreConfig.getStoreId()-1)){
+            if(vipLeve<(sStoreConfig.getSort()-1)){
                 return "vip leve limit";
             }
 //            if(user.getPlayerInfoManager().getHadTakeLevelBoxVip().contains(vipLeve)){