From 6dfb4599cee5c19f4d1c5cc344a4f84de1c1633c Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期一, 16 十二月 2019 15:26:57 +0800 Subject: [PATCH] 冲突信息 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 28 +++++++++++++--------------- 1 files changed, 13 insertions(+), 15 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java index 5cb24be..f6b198e 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java @@ -7,11 +7,11 @@ import java.util.List; import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import org.yeshi.utils.HttpUtil; import org.yeshi.utils.JsonUtil; import com.yeshi.fanli.dto.money.InviteGetMoney; @@ -19,7 +19,6 @@ import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture; import com.yeshi.fanli.entity.bus.user.ThreeSale; import com.yeshi.fanli.entity.bus.user.UserInfo; -import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.system.BusinessSystem; import com.yeshi.fanli.entity.system.SystemClientParams; import com.yeshi.fanli.exception.NotExistObjectException; @@ -141,7 +140,7 @@ boolean hasCode = false; if (uid != null && uid.trim().length() > 0) { - String inviteCode = userInfoExtraService.getUserInviteCode(Long.parseLong(uid)); + String inviteCode = userInfoExtraService.getInviteCodeByUid(Long.parseLong(uid)); if (inviteCode != null && inviteCode.trim().length() > 0) { hasCode = true; // 宸叉湁閭�璇风爜 } @@ -172,22 +171,22 @@ * @throws IOException */ @RequestMapping(value = "/listInviteFriendImg", method = RequestMethod.POST) - public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out) + public void listInviteFriendImg(AcceptData acceptData, Long uid, PrintWriter out, HttpServletRequest request) throws NotExistObjectException, IOException { JSONObject data = new JSONObject(); if (uid != null && !uid.equals("0")) { - List<String> imgList = spreadUserImgService.getUserSpreadImg(uid); + List<String> imgList = spreadUserImgService.getUserSpreadImg(uid, request); data.put("imgUrlList", JsonUtil.getSimpleGsonWithDate().toJson(imgList)); } // 閭�璇烽摼鎺� - String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" - + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid); - data.put("inviteLink", shortLink); +// String shortLink = HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/" +// + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid); + data.put("inviteLink", "http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate"); - UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); - if (userInfoExtra != null) { - data.put("inviteCode", userInfoExtra.getInviteCode()); + String inviteCode = userInfoExtraService.getInviteCodeByUid(uid); + if (!StringUtil.isNullOrEmpty(inviteCode)) { + data.put("inviteCode", inviteCode); } // 閭�璇疯鍒� @@ -247,7 +246,6 @@ @RequestMapping(value = "activationInvite") public void activationInvite(AcceptData acceptData, String callback, Long uid, String inviteCode, PrintWriter out) { try { - if (uid == null || inviteCode == null) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝g‘")); return; @@ -311,15 +309,15 @@ return; } - UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); - if (userInfoExtra == null || userInfoExtra.getInviteCode() == null) { + String inviteCode = userInfoExtraService.getInviteCodeByUid(uid); + if (StringUtil.isNullOrEmpty(inviteCode)) { JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("閭�璇风爜涓嶅瓨鍦�")); return; } String tip = configService.get("invite_activation_success_tip"); JSONObject data = new JSONObject(); - data.put("inviteCode", userInfoExtra.getInviteCode()); + data.put("inviteCode", inviteCode); data.put("tip", tip); JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data)); -- Gitblit v1.8.0