From a011e862f215935433ded7fa3d21211091043c87 Mon Sep 17 00:00:00 2001
From: zhangshanxue <zhangshanxue@lanjinshidai.com.cn>
Date: Mon, 27 Apr 2020 10:07:43 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=A7=BB=E9=99=A4=20?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ljsd/jieling/logic/GlobalDataManaager.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
index f3c941ffc..a8eb3fc0c 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
@@ -367,7 +367,12 @@ public class GlobalDataManaager implements IManager {
                 updateBuyTimesGoodsId.add(next.getKey());
                 long endTime = next.getValue();
                 while (endTime<now){
-                    endTime +=  SRechargeCommodityConfig.rechargeCommodityConfigMap.get(next.getKey()).getDailyUpdate() * TimeUtils.ONE_DAY ;
+                    SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(next.getKey());
+                    if(null==sRechargeCommodityConfig){
+                        LOGGER.error("Exception：旧配置删除");
+                        break;
+                    }
+                    endTime +=  sRechargeCommodityConfig.getDailyUpdate() * TimeUtils.ONE_DAY ;
                 }
                 refreshBagMap.put(next.getKey(),endTime);
                 update =true;