From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001 From: admin <2780501319@qq.com> Date: 星期日, 01 三月 2020 16:37:26 +0800 Subject: [PATCH] 动态提示语调整 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java index bb0886a..d4178a3 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java @@ -32,6 +32,7 @@ import com.yeshi.fanli.entity.push.DeviceActive; import com.yeshi.fanli.entity.shop.BanLiShopOrder; import com.yeshi.fanli.entity.system.BusinessSystem; +import com.yeshi.fanli.entity.system.ConfigKeyEnum; import com.yeshi.fanli.exception.user.UserAccountException; import com.yeshi.fanli.exception.user.vip.UserVIPInfoException; import com.yeshi.fanli.log.LogHelper; @@ -231,6 +232,7 @@ } else { JSONObject data = new JSONObject(); data.put("userInfo", UserUtil.filterForClientUser(userInfo)); + data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId())); out.print(JsonUtil.loadTrueResult(data)); final UserInfo uuser = userInfo; @@ -267,7 +269,7 @@ } else { out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg())); try { - LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage()); + LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage()); } catch (Exception e1) { e1.printStackTrace(); } @@ -388,7 +390,7 @@ vo.setNickName(userInfo.getNickName()); vo.setPortrait(userInfo.getPortrait()); vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5")); - vo.setCsdLink(configService.get("customer_service_link")); + vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey())); Date now = new Date(); Date start = new Date(0); @@ -440,16 +442,15 @@ } vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid)); - List<Integer> list = new ArrayList<Integer>(); list.add(BanLiShopOrder.STATE_SUCCESS); BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay")); vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString())); - vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney)); + vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, + TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney)); vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list)); - // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴� String limtDate = userVipConfigService.getValueByKey("vip_execute_time"); Date executeDate = null; @@ -520,7 +521,8 @@ BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay")); BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid); - long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney); + long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, + TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney); long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list); BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid); @@ -535,7 +537,7 @@ } catch (ParseException e) { e.printStackTrace(); } - + UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid); if (extra != null && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) { -- Gitblit v1.8.0