From 012232edc4dac15517c69c2af3934f901e818b7c Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期四, 26 十二月 2019 15:57:53 +0800 Subject: [PATCH] 帮助中心 + 新人红包统计 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java index 7d13a92..d205071 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java @@ -2127,6 +2127,7 @@ } data.put("moduleState", mySettings); + boolean tailor = false; int welfareCenterNews = 0; String invitCode = null; UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); @@ -2138,6 +2139,7 @@ if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCodeVip())) { invitCode = userInfoExtra.getInviteCodeVip(); } else if (!StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) { + tailor = true; invitCode = userInfoExtra.getInviteCode(); } @@ -2159,10 +2161,16 @@ if (!StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) userInfo.setWeiXin(userInfoExtra.getWeiXin()); } + + // 浜岀淮鐮� + userInfo.setErCode(userInfoExtra.getErCode()); } + // 鏄剧ず閭�璇风爜鐗瑰埗鍏ュ彛 + data.put("tailor", tailor); + // 1.6.5 涔嬪悗杩斿洖 寰俊鍙锋彁绀� if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion())) - userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜屼竴绾ч槦鍛樺彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�"); + userInfo.setWeiXinTip("娣诲姞寰俊鍙峰悗锛屼綘鐨勯個璇蜂汉鍜岀洿鎺ョ矇涓濆彲浠ラ�氳繃寰俊涓庝綘寤虹珛鑱旂郴銆�"); // 鏌ヨ鏄惁涓篤IP if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) { @@ -2192,6 +2200,20 @@ data.put("redPackLock", verifyForbid); } + + if (!StringUtil.isNullOrEmpty(invitCode)) { + // 2.0.6 杩斿洖閭�璇蜂汉 + if (VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) { + String bossName = ""; + ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid); + if (threeSale != null && threeSale.getBoss() != null) { + bossName = threeSale.getBoss().getNickName(); + } + data.put("bossName", bossName); + } + } + + out.print(JsonUtil.loadTrueResult(data)); final UserInfo uuser = userInfo; @@ -2304,7 +2326,7 @@ */ @RequestMapping(value = "saveInfo") public void saveInfo(AcceptData acceptData, String nickName, String weiXin, Integer sex, Long uid, - String inviteCode, PrintWriter out) { + String inviteCode, MultipartFile qrCodeFile, HttpServletRequest request, PrintWriter out) { try { if (uid == null) { out.print(JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�")); @@ -2379,6 +2401,14 @@ return; } } + + // 浜岀淮鐮� + if (qrCodeFile != null) { + userInfoExtraService.uploadERCode(qrCodeFile, uid); + } + + + out.print(JsonUtil.loadTrueResult("淇濆瓨鎴愬姛")); } catch (UserInfoException e) { out.print(JsonUtil.loadFalseResult(e.getMsg())); -- Gitblit v1.8.0