From 3960f9e240583efb212307cd6ecb8438f8aa9a26 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 21 May 2021 11:16:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=87=91=E9=A2=9D=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=8A=A5=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jmfy/controller/QuestionController.java | 4 +++- .../java/com/jmfy/controller/SupportController.java | 13 +++++++------ .../com/jmfy/controller/UserInfoController.java | 6 ++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jmfy/controller/QuestionController.java b/src/main/java/com/jmfy/controller/QuestionController.java index acfbd31..2ef97dc 100644 --- a/src/main/java/com/jmfy/controller/QuestionController.java +++ b/src/main/java/com/jmfy/controller/QuestionController.java @@ -181,7 +181,9 @@ public class QuestionController { } else { cQuestVo.setUserId(gsUser.getId()); cQuestVo.setLevel(gsUser.getPlayerManager().getLevel()); - cQuestVo.setSave_amt(gsUser.getPlayerManager().getRechargeInfo().getSaveAmt()); + Integer saveAmt = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo()) + .map(GSRechargeInfoBean::getSaveAmt).orElse(0); + cQuestVo.setSave_amt(saveAmt); List answers = gsUser.getQuestionManagerBean().getAnswerMap().getOrDefault(questId, new ArrayList<>()); String[] strings = new String[answers.size()]; cQuestVo.setAnswer(answers.toArray(strings)); diff --git a/src/main/java/com/jmfy/controller/SupportController.java b/src/main/java/com/jmfy/controller/SupportController.java index caf0c83..6482b78 100644 --- a/src/main/java/com/jmfy/controller/SupportController.java +++ b/src/main/java/com/jmfy/controller/SupportController.java @@ -17,10 +17,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 扶持功能,申请和审核 @@ -358,7 +355,9 @@ public class SupportController { } user.setId(seqUtils.getSequence("support_user_id")); user.setUserName(gsUser.getPlayerManager().getNickName()); - user.setRechargeMoney(gsUser.getPlayerManager().getRechargeInfo().getSaveAmt()); + Integer rechargeMoney = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo()) + .map(GSRechargeInfoBean::getSaveAmt).orElse(0); + user.setRechargeMoney(rechargeMoney); user.setCreateTime(DateUtil.nowString()); // 入库 supportUserDao.insertSupportUser(user); @@ -405,7 +404,9 @@ public class SupportController { if (gsUser == null){ continue; } - map.put(gsUser.getId(),gsUser.getPlayerManager().getRechargeInfo().getSaveAmt()); + Integer rechargeMoney = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo()) + .map(GSRechargeInfoBean::getSaveAmt).orElse(0); + map.put(gsUser.getId(),rechargeMoney); } user.setRechargeMoney(map.get(user.getUserId())); } diff --git a/src/main/java/com/jmfy/controller/UserInfoController.java b/src/main/java/com/jmfy/controller/UserInfoController.java index 3269139..8fc8e94 100644 --- a/src/main/java/com/jmfy/controller/UserInfoController.java +++ b/src/main/java/com/jmfy/controller/UserInfoController.java @@ -21,6 +21,7 @@ import javax.servlet.http.HttpSession; import java.io.PrintWriter; import java.util.HashMap; import java.util.List; +import java.util.Optional; /** * Created by huangds on 2017/10/24. @@ -136,8 +137,9 @@ public class UserInfoController { cUserVo.setGem(gsUser.getItemManager().getItemMap().getOrDefault(16,new GSItemBean()).getItemNum()); cUserVo.setGold(gsUser.getItemManager().getItemMap().getOrDefault(14,new GSItemBean()).getItemNum()); cUserVo.setCurStamina(gsUser.getItemManager().getItemMap().getOrDefault(3,new GSItemBean()).getItemNum()); - - cUserVo.setSave_amt(gsUser.getPlayerManager().getRechargeInfo().getSaveAmt()); + Integer saveAmt = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo()) + .map(GSRechargeInfoBean::getSaveAmt).orElse(0); + cUserVo.setSave_amt(saveAmt); cUserVo.setCreateTime(JsonUtil.timeStamp2Date(String.valueOf(gsUser.getPlayerManager().getCreateTime()))); cUserVo.setOutLineTime(JsonUtil.timeStamp2Date(String.valueOf(gsUser.getPlayerManager().getOffLineTime())));