From 97f5e5b7e55b8907480385414236e9dac89eb857 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 四月 2019 18:20:21 +0800
Subject: [PATCH] 修改商品标签版本兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 393 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 245 insertions(+), 148 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
index aac326d..647e4e9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java
@@ -45,7 +45,6 @@
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.ExtractRecord;
import com.yeshi.fanli.entity.bus.user.LostOrder;
-import com.yeshi.fanli.entity.bus.user.PassWordErrorRecord;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
@@ -67,6 +66,7 @@
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
import com.yeshi.fanli.exception.user.UserCustomSettingsException;
+import com.yeshi.fanli.exception.user.UserInfoException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
@@ -86,7 +86,6 @@
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractRecordService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
@@ -134,9 +133,6 @@
@Resource
private ExtractService extractService;
-
- @Resource
- private PassWordErrorRecordService passWordErrorRecordService;
@Resource
private ConfigService configService;
@@ -578,10 +574,20 @@
data.put("moduleState", mySettings);
int welfareCenterNews = 0;
+ String invitCode = null;
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
- if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
- welfareCenterNews = userInfoExtra.getCouponNews();
+ if (userInfoExtra != null) {
+ if (userInfoExtra.getCouponNews() != null) {
+ welfareCenterNews = userInfoExtra.getCouponNews();
+ }
+
+ if (userInfoExtra.getInviteCode() != null && userInfoExtra.getInviteCode().trim().length() > 0) {
+ invitCode = userInfoExtra.getInviteCode();
+ }
}
+ // 閭�璇风爜
+ data.put("invitCode", invitCode);
+ // 绂忓埄涓績娑堟伅
data.put("welfareCenterNews", welfareCenterNews);
out.print(JsonUtil.loadTrueResult(data));
@@ -971,39 +977,6 @@
}
/**
- * 瀹㈡埛绔彁鐜板瘑鐮佽緭鍏ラ敊璇椂璋冪敤
- *
- * @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * @param out
- */
- @RequestMapping(value = "errormax", method = RequestMethod.POST)
- public void errorMax(AcceptData acceptData, long uid, PrintWriter out) {
- UserInfo user = userInfoService.getUserById(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
- PassWordErrorRecord record = passWordErrorRecordService.getRecord(user.getId());
- record.setUserInfo(user);
- String maxErrorStr = "5";
- maxErrorStr = configService.get(PASSWORD_MAX_ERROR); // 褰撴棩杈撻敊瀵嗙爜鏈�澶氭鏁�
- int maxError = Integer.parseInt(maxErrorStr);
- int count = passWordErrorRecordService.setRecord(record);
- JSONObject data = new JSONObject();
- int c = maxError - count;
- if (c <= 0) { // 褰撻敊璇鏁拌繕鏈秴杩囧綋鏃ヨ緭閿欐渶澶氭鏁版椂锛宻tate涓�1锛屼唬琛ㄨ繕鑳界户缁緭鍏ワ紝little涓哄墿浣欐鏁般�俿tate涓�2鍒欎笉鑳界户缁緭鍏ワ紝鎻愮幇瀹㈡埛绔��鍑鸿緭鍏ュ瘑鐮佺晫闈�
- data.put("state", "2");
- data.put("little", 0);
- } else {
- data.put("state", "1");
- data.put("little", c);
- }
- out.print(JsonUtil.loadTrueResult(data));
- }
-
- /**
* 娣诲姞鐢ㄦ埛鎻愮幇璐﹀彿
*
* @param acceptData
@@ -1076,109 +1049,6 @@
data.put("count", deletecount);
out.print(JsonUtil.loadTrueResult(data));
return;
- }
-
- /**
- * 鎻愮幇
- *
- * @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * @param money
- * 鎻愮幇閲戦
- * @param pwd
- * 瀵嗙爜
- * @param request
- * @param type
- * 鎻愮幇璐︽埛绫诲瀷
- * @param out
- */
- @RequestMapping(value = "extractmoney", method = RequestMethod.POST)
- public void extractMoney(AcceptData acceptData, long uid, double money, String pwd, HttpServletRequest request,
- int type, PrintWriter out) {
- UserInfo user = userInfoService.getUserById(uid);
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]");
- if (user == null) {
- LogHelper.userInfo("涓嶅瓨鍦ㄨ鐢ㄦ埛:uid=" + uid);
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
- BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
- acceptData.getPackages());
- if (system == null) {
- LogHelper.userInfo("鎻愮幇鏃讹紝涓嶅瓨鍦ㄨ绯荤粺");
- out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
- return;
- }
- PassWordErrorRecord record = passWordErrorRecordService.getRecord(user.getId());
- int errorcount = record.getCount();
- String maxStr = "5";
- maxStr = configService.get(PASSWORD_MAX_ERROR);
- int max = Integer.parseInt(maxStr);
- if (max <= errorcount) {
- LogHelper.userInfo("[ip:" + IPUtil.getRemotIP(request) + "]鐢ㄦ埛[" + GsonUtil.toJson(user) + "]:鎻愮幇瀵嗙爜閿欒宸茶揪涓婇檺锛�");
- out.print(JsonUtil.loadFalseResult("鎻愮幇瀵嗙爜宸茶揪鍒版瘡鏃ラ敊璇鏁颁笂闄愶紝璇锋槑鏃ュ啀璇曪紒"));
- return;
- }
-
- if (pwd == null || !pwd.equals(user.getPayPassword())) {
- passWordErrorRecordService.setRecord(record);
- out.print(JsonUtil.loadFalseResult("鏀粯瀵嗙爜閿欒"));
- return;
- }
-
- passWordErrorRecordService.deleteRecord(uid);// 褰撴彁鐜板瘑鐮佽緭鍏ユ纭椂锛屾竻闄ゅ綋鍓嶇敤鎴风殑瀵嗙爜閿欒杈撳叆璁板綍
-
- String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鏈�灏忛噾棰�
-
- if (money < 0.1) { // 杞笎鍒版敮浠樺疂鐨勬渶灏忛噾棰�
- out.print(JsonUtil.loadFalseResult("鍗曠瑪鎻愮幇閲戦闇�瑕佸ぇ浜庯細" + 0.1 + "鍏�"));
- return;
- }
-
- double dminMoney = Double.parseDouble(minMoney);
- if (money < dminMoney) { // 鍚庡彴璁剧疆鐨勫崟绗旇浆璐︾殑鏈�灏忛噾棰�
- out.print(JsonUtil.loadFalseResult("鍗曠瑪鎻愮幇閲戦闇�瑕佸ぇ浜庯細" + dminMoney + "鍏�"));
- return;
- }
- String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 鍗曠瑪鎻愮幇鏈�澶ч噾棰�
- double dmaxMoney = Double.parseDouble(maxMoney);
- if (dmaxMoney < money) { // 鍚庡彴璁剧疆鐨勫崟绗旇浆璐︾殑鏈�澶ч噾棰�
- out.print(JsonUtil.loadFalseResult("鍗曠瑪鎻愮幇閲戦澶氫负锛�" + dmaxMoney + "鍏�"));
- return;
- }
-
- if (type != Constant.ZHIFUBAO && type != Constant.WEIXIN) { // 鎻愮幇绫诲瀷蹇呴』鏄敮浠樺疂绫诲瀷鎴栬�呭井淇＄被鍨嬶紝鐩墠锛�20170506锛変粎鏀寔鏀粯瀹�
- out.print(JsonUtil.loadFalseResult(Constant.NOTYPE));
- return;
- }
-
- BindingAccount bindingAccount = bindingAccountService.getBindingAccountByUidAndType(uid, type);
- if (bindingAccount == null) {
- out.print(JsonUtil.loadFalseResult(Constant.NOACCOUNT));
- return;
- }
-
- Extract extract = new Extract();
- extract.setIp(IPUtil.getRemotIP(request));
- extract.setAccount(bindingAccount.getAccount());
- extract.setName(bindingAccount.getName());
- extract.setMoney(new BigDecimal(String.valueOf(money)));
- extract.setUserInfo(user);
- extract.setExtractTime(java.lang.System.currentTimeMillis());
- extract.setType(type);
- extract.setState(0);
- extract.setSystem(system);
- Integer etype = extractService.addExtract(extract);
- if (etype == null) {
- out.print(JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
- return;
- } else if (etype == 1 || etype == 2) {
- out.print(JsonUtil.loadFalseResult("宸茶秴杩囧綋鏃ユ彁鐜版鏁版垨鎻愮幇閲戦"));
- } else if (etype == 3) {
- out.print(JsonUtil.loadFalseResult("鎻愮幇閲戦澶т簬鎴戠殑绾㈠寘"));
- }
-
}
/**
@@ -1286,13 +1156,17 @@
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
}
- AdminUser adminUser = adminUserService.selectByPrimaryKey(4L);
+
+ long[] targetUids = new long[] { 3L, 4L };
Config config = configService.getConfig("extract_code_email_from");
String[] sts = config.getValue().split(",");
String account = sts[0];
String pwd = sts[1];
- String msg = "鎻愮幇瀹℃牳閾炬帴:" + url;
- boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "鏈夋柊鐨勬彁鐜板鏍�", msg);
+ for (long adminId : targetUids) {
+ AdminUser adminUser = adminUserService.selectByPrimaryKey(adminId);
+ String msg = "鎻愮幇瀹℃牳閾炬帴:" + url;
+ boolean isS = MailSenderUtil.sendEmail(adminUser.getEmail(), account, pwd, "鏈夋柊鐨勬彁鐜板鏍�", msg);
+ }
}
});
return;
@@ -1302,6 +1176,8 @@
out.print(JsonUtil.loadFalseResult("宸茶秴杩囧綋鏃ユ彁鐜伴噾棰�"));
} else if (etype == 3) {
out.print(JsonUtil.loadFalseResult("鎻愮幇閲戦澶т簬鎴戠殑绾㈠寘"));
+ } else if (etype == 111) {
+ out.print(JsonUtil.loadFalseResult("鏇存崲浜嗘墜鏈哄彿鍚�7澶╁唴涓嶅厑璁告彁鐜�"));
}
}
@@ -1716,9 +1592,9 @@
JSONObject resultData = new JSONObject();
if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, null);
} else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, null);
}
// 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
@@ -1776,6 +1652,78 @@
e.printStackTrace();
}
+ }
+
+ /**
+ * 鐢ㄦ埛闃熷憳鍒楄〃鏌ヨ 1.5.3鏌ヨ鏈夋晥闃熷憳
+ *
+ * @param acceptData
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "getMyTeamNew", method = RequestMethod.POST)
+ public void getMyTeamNew(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {
+
+ try {
+ int pageSize = Constant.PAGE_SIZE;
+
+ JSONObject resultData = new JSONObject();
+ if (type == 1) {
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid, 1);
+ } else if (type == 2) {
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid, 1);
+ }
+
+ // 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform)) {
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+
+ JSONObject bossData = null;
+ ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
+ if (threeSale != null) {
+ bossData = new JSONObject();
+ UserInfo boss = threeSale.getBoss();
+ if (boss != null) {
+ bossData.put("nickName", boss.getNickName());
+ bossData.put("portrait", boss.getPortrait());
+ }
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ Long createTime = threeSale.getCreateTime();
+ Date inviteTime = new Date(createTime);
+ bossData.put("inviteTime", "閭�璇锋椂闂�: " + sdf.format(inviteTime));
+ }
+
+ String helpLink = configService.get("team_help_url");
+ if (helpLink == null) {
+ helpLink = "";
+ }
+
+ boolean hasCode = false;
+ String inviteCode = userInfoExtraService.getUserInviteCode(uid);
+ if (inviteCode != null && inviteCode.trim().length() > 0) {
+ hasCode = true; // 宸叉湁閭�璇风爜
+ } else {
+ // 閭�璇锋縺娲婚摼鎺�
+ resultData.put("activationlink", configService.get("invite_activation_url"));
+ }
+ resultData.put("hasCode", hasCode);
+
+ resultData.put("helpLink", helpLink);
+ resultData.put("firstTeam", firstTeam);
+ resultData.put("secondTeam", secondTeam);
+ resultData.put("boss", bossData);
+ }
+ out.print(JsonUtil.loadTrueResult(resultData));
+ } catch (UserInfoExtraException e) {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
+ e.printStackTrace();
+ }
}
/**
@@ -2049,4 +1997,153 @@
e.printStackTrace();
}
}
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ *
+ * @param acceptData
+ * @param form
+ * @param requst
+ * @param out
+ */
+ @RequestMapping(value = "getuserinfoNew", method = RequestMethod.POST)
+ public void getuserinfoNew(AcceptData acceptData, Long uid, HttpServletRequest requst, PrintWriter out) {
+ try {
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult("璇锋眰鍙傛暟涓虹┖"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.getUserInfo(uid);
+
+ // 娣诲姞鐢ㄦ埛娲昏穬璁板綍
+ UserActiveLog userActiveLog = new UserActiveLog();
+ userActiveLog.setChannel(acceptData.getChannel());
+ userActiveLog.setIp(requst.getRemoteHost());
+ userActiveLog.setUid(userInfo.getId());
+ userActiveLog.setVersionCode(acceptData.getVersion());
+ userActiveLog.setOsVersion(acceptData.getOsVersion());
+ userActiveLog.setDeviceType(acceptData.getDeviceType());
+ userActiveLogService.addUserActiveLog(userActiveLog);
+
+ // 澶勭悊鐢ㄦ埛淇℃伅
+ outUserInfoHandle(userInfo);
+
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ JSONObject data = new JSONObject();
+ data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
+
+ // 鐣岄潰鐘舵��
+ UserSettingsVO mySettings = null;
+ try {
+ mySettings = userCustomSettingsService.getMySettings(uid);
+ } catch (UserCustomSettingsException e) {
+ mySettings = new UserSettingsVO();
+ e.printStackTrace();
+ }
+
+ if (mySettings.getCancelNotice() == null) {
+ mySettings.setCancelNotice(0);
+ }
+ if (mySettings.getNoBonusCount() == null) {
+ mySettings.setNoBonusCount(0);
+ }
+ if (mySettings.getNoNewsRedDot() == null) {
+ mySettings.setNoNewsRedDot(0);
+ }
+ if (mySettings.getNoShareRecordAndStorage() == null) {
+ mySettings.setNoShareRecordAndStorage(0);
+ }
+ if (mySettings.getNoInvitationBonus() == null) {
+ mySettings.setNoInvitationBonus(0);
+ }
+ data.put("moduleState", mySettings);
+
+ int welfareCenterNews = 0;
+ String invitCode = null;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ if (userInfoExtra.getCouponNews() != null) {
+ welfareCenterNews = userInfoExtra.getCouponNews();
+ }
+
+ if (userInfoExtra.getInviteCode() != null && userInfoExtra.getInviteCode().trim().length() > 0) {
+ invitCode = userInfoExtra.getInviteCode();
+ }
+
+ if (userInfoExtra.getUserRank() != null) {
+ String picture = userInfoExtra.getUserRank().getPicture();
+ String icon = userInfoExtra.getUserRank().getIcon();
+ userInfo.setRankNamePicture(picture);
+ userInfo.setRankIcon(icon);
+ } else {
+ userInfo.setRankNamePicture(null);
+ userInfo.setRankIcon(null);
+ }
+ }
+
+ data.put("invitCode", invitCode); // 閭�璇风爜
+ data.put("welfareCenterNews", welfareCenterNews);// 绂忓埄涓績娑堟伅
+ out.print(JsonUtil.loadTrueResult(data));
+
+ final UserInfo uuser = userInfo;
+ ThreadUtil.run(new Runnable() {
+ public void run() {
+ try {
+ // 鑾峰彇閭�璇风爜锛氳嫢鏃犻個璇风爜涓斿瓨鍦ㄦ湁鏁堢殑闃熷憳鍏崇郴 鍒欒嚜鍔ㄧ敓鎴愰個璇风爜
+ userInfoExtraService.getUserInviteCode(uuser.getId());
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+
+ // 鏇存柊鐢ㄦ埛闄勫姞淇℃伅锛岃�佺敤鎴蜂笉瀛樺湪鐨勯渶瑕佹坊鍔�
+ try {
+ userInfoExtraService.updateUserRankByUid(uuser.getId());
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+
+ } catch (UserInfoException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ } catch (Exception e) {
+ out.print(JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ private void outUserInfoHandle(UserInfo user) {
+
+ // 绾㈠寘澶勭悊
+ user.setTotalHongBao(new BigDecimal(0));
+ user.setNoOpenHongBao(new BigDecimal(0));
+ user.setCanOpenHongBao(new BigDecimal(0));
+
+ // 鐢佃瘽鍙风爜澶勭悊
+ if (!StringUtil.isNullOrEmpty(user.getPhone())) {
+ if (user.getPhone().length() > 5) {
+ String phone = user.getPhone().substring(0, 3);
+ phone += "******";
+ phone += user.getPhone().substring(user.getPhone().length() - 2, user.getPhone().length());
+ user.setPhone(phone);
+ }
+ }
+
+ UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId());
+ if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {
+ String picture = userInfoExtra.getUserRank().getPicture();
+ String icon = userInfoExtra.getUserRank().getIcon();
+ user.setRankNamePicture(picture);
+ user.setRankIcon(icon);
+ }
+ }
+
}
--
Gitblit v1.8.0