generated from root/miduo_server
玩家信息查询增加真实充值金额展示
parent
24bebd1365
commit
38d0983e77
|
|
@ -125,7 +125,7 @@ public class QuestionController {
|
|||
|
||||
|
||||
@RequestMapping(value = "/getUserQuestInfo", method = {RequestMethod.POST, RequestMethod.GET})
|
||||
public String getUserInfo(HttpSession session, ModelMap map, HttpServletRequest request) throws Exception {
|
||||
public String getUserInfo(ModelMap map, HttpServletRequest request) throws Exception {
|
||||
|
||||
List<ServerInfo> allServerInfo = serverInfoDao.getAllServerInfo();
|
||||
List<String> serverList = new ArrayList<>();
|
||||
|
|
@ -140,17 +140,16 @@ public class QuestionController {
|
|||
if (serveIds.equals("0")) {//全服
|
||||
for (ServerInfo serverInfo : allServerInfo) {
|
||||
try {
|
||||
for (GSUser gsUser : gsUserDao.findAllUserInfo(Integer.valueOf(serverInfo.getServer_id()), Integer.valueOf(questId))) {
|
||||
for (GSUser gsUser : gsUserDao.findAllUserInfo(Integer.parseInt(serverInfo.getServer_id()), Integer.parseInt(questId))) {
|
||||
CQuestVo cQuestVo = getcUserVo(gsUser, questId);
|
||||
if (null == cQuestVo) {
|
||||
continue;
|
||||
}
|
||||
cQuestVo.setServerId(Integer.valueOf(serverInfo.getServer_id()));
|
||||
cQuestVo.setServerId(Integer.parseInt(serverInfo.getServer_id()));
|
||||
cQuestVos.add(cQuestVo);
|
||||
}
|
||||
} catch (Exception e) {
|
||||
}
|
||||
|
||||
}
|
||||
} else { // 发送指定服务器公告
|
||||
String[] split = serveIds.split(",");
|
||||
|
|
@ -181,11 +180,8 @@ public class QuestionController {
|
|||
} else {
|
||||
cQuestVo.setUserId(gsUser.getId());
|
||||
cQuestVo.setLevel(gsUser.getPlayerManager().getLevel());
|
||||
Integer saveAmt = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo())
|
||||
.map(GSRechargeInfoBean::getSaveAmt).orElse(0);
|
||||
double rr = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo())
|
||||
.map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
cQuestVo.setSave_amt(saveAmt+(float)rr);
|
||||
double rr = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo()).map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
cQuestVo.setSave_amt((float)rr);
|
||||
List<String> answers = gsUser.getQuestionManagerBean().getAnswerMap().getOrDefault(questId, new ArrayList<>());
|
||||
String[] strings = new String[answers.size()];
|
||||
cQuestVo.setAnswer(answers.toArray(strings));
|
||||
|
|
|
|||
|
|
@ -379,8 +379,7 @@ public class SupportController {
|
|||
|
||||
user.setId(seqUtils.getSequence("support_user_id"));
|
||||
user.setUserName(gsUser.getPlayerManager().getNickName());
|
||||
Double rechargeMoney = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo())
|
||||
.map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
Double rechargeMoney = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo()).map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
user.setRechargeMoney(rechargeMoney);
|
||||
user.setCreateTime(DateUtil.nowString());
|
||||
// 入库
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ public class UserInfoController {
|
|||
return "发送成功";
|
||||
}
|
||||
|
||||
private CUserVo getcUserVo(GSUser gsUser) {
|
||||
public static CUserVo getcUserVo(GSUser gsUser) {
|
||||
CUserVo cUserVo = new CUserVo();
|
||||
if (gsUser == null) {
|
||||
cUserVo.setIsData(0);
|
||||
|
|
@ -158,21 +158,19 @@ 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());
|
||||
Integer saveAmt = Optional.ofNullable(gsUser.getPlayerManager().getRechargeInfo())
|
||||
.map(GSRechargeInfoBean::getSaveAmt).orElse(0);
|
||||
double rr = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo())
|
||||
.map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
cUserVo.setSave_amt(saveAmt+(float)rr);
|
||||
double rr = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo()).map(GsNewRechargeInfoBean::getRr).orElse(0.0);
|
||||
cUserVo.setSave_amt(rr);
|
||||
double rmb = Optional.ofNullable(gsUser.getPlayerManager().getNewRechargeInfo()).map(GsNewRechargeInfoBean::getRealityRmb).orElse(0.0);
|
||||
cUserVo.setReality_rmb(rmb);
|
||||
cUserVo.setCreateTime(JsonUtil.timeStamp2Date(String.valueOf(gsUser.getPlayerManager().getCreateTime())));
|
||||
cUserVo.setOutLineTime(JsonUtil.timeStamp2Date(String.valueOf(gsUser.getPlayerManager().getOffLineTime())));
|
||||
|
||||
}
|
||||
return cUserVo;
|
||||
}
|
||||
|
||||
@RequestMapping(value = "/addWhiteList", method = {RequestMethod.POST, RequestMethod.GET})
|
||||
public @ResponseBody
|
||||
int addWhiteList(HttpSession session, HttpServletRequest request) throws Exception {
|
||||
int addWhiteList(HttpServletRequest request) throws Exception {
|
||||
HashMap<String, String> parameterMap = JsonUtil.getInstence().getParameterMap(request);
|
||||
String userIds = parameterMap.get("userIds");
|
||||
int type = Integer.parseInt(parameterMap.get("type"));
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import java.util.Map;
|
|||
public class GsNewRechargeInfoBean{
|
||||
|
||||
private double rr;//累计充值
|
||||
private double realityRmb;//真实充值金额
|
||||
private double maxSingleR;//单次最大充值金额
|
||||
|
||||
private double monthRr ; //月卡累计总额
|
||||
|
|
@ -37,6 +38,14 @@ public class GsNewRechargeInfoBean{
|
|||
this.rr = rr;
|
||||
}
|
||||
|
||||
public double getRealityRmb() {
|
||||
return realityRmb;
|
||||
}
|
||||
|
||||
public void setRealityRmb(double realityRmb) {
|
||||
this.realityRmb = realityRmb;
|
||||
}
|
||||
|
||||
public double getMaxSingleR() {
|
||||
return maxSingleR;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,9 @@ public class CUserVo implements java.io.Serializable {
|
|||
|
||||
public long curStamina;//体力
|
||||
|
||||
public float save_amt; //目前儲值
|
||||
public double save_amt; //目前儲值
|
||||
|
||||
public double reality_rmb; //真是储值
|
||||
|
||||
public String createTime; //创建时间
|
||||
|
||||
|
|
@ -60,10 +62,18 @@ public class CUserVo implements java.io.Serializable {
|
|||
this.curStamina = curStamina;
|
||||
}
|
||||
|
||||
public void setSave_amt(float save_amt) {
|
||||
public void setSave_amt(double save_amt) {
|
||||
this.save_amt = save_amt;
|
||||
}
|
||||
|
||||
public double getReality_rmb() {
|
||||
return reality_rmb;
|
||||
}
|
||||
|
||||
public void setReality_rmb(double reality_rmb) {
|
||||
this.reality_rmb = reality_rmb;
|
||||
}
|
||||
|
||||
public void setCreateTime(String createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@
|
|||
<th width="200">妖精</th>
|
||||
<th width="200">金幣</th>
|
||||
<th width="200">成长护符</th>
|
||||
<th width="500">目前儲值</th>
|
||||
<th width="200">目前儲值</th>
|
||||
<th width="200">真实儲值</th>
|
||||
<th width="1000">創角時間</th>
|
||||
<th width="800">最近登出時間</th>
|
||||
</tr>
|
||||
|
|
@ -64,6 +65,7 @@
|
|||
<td th:text="${cUserVo.gold}" style="text-align: center;"></td>
|
||||
<td th:text="${cUserVo.curStamina}" style="text-align: center;"></td>
|
||||
<td th:text="${cUserVo.save_amt}" style="text-align: center;"></td>
|
||||
<td th:text="${cUserVo.reality_rmb}" style="text-align: center;"></td>
|
||||
<td th:text="${cUserVo.createTime}" style="text-align: center;"></td>
|
||||
<td th:text="${cUserVo.outLineTime}" style="text-align: center;"></td>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue