From d49287202635214ca9f9aba80f4e242b7f77d0a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:12:49 +0800
Subject: [PATCH] 抽奖规则 代码bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserInfoController.java | 141 +++++++++++++++++++++++++++++++---------------
1 files changed, 95 insertions(+), 46 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 cb81a1d..d4bf15b 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
@@ -53,6 +53,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
import com.yeshi.fanli.entity.bus.user.UserActiveLog;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.Config;
@@ -248,6 +249,12 @@
// }
// });
if (find != null) {
+ if (find.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER,
+ Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
// 閭�璇峰叧绯荤敓鏁�
threeSaleSerivce.effective(find);
// 閲嶆柊璁＄畻鐢ㄦ埛绛夌骇
@@ -585,11 +592,29 @@
}
data.put("moduleState", mySettings);
-
+
+ int welfareCenterNews = 0;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(user.getId());
+ if (userInfoExtra != null && userInfoExtra.getCouponNews() != null) {
+ welfareCenterNews = userInfoExtra.getCouponNews();
+ }
+ data.put("welfareCenterNews", welfareCenterNews);
+
+
+
out.print(JsonUtil.loadTrueResult(data));
+
final UserInfo uuser = user;
ThreadUtil.run(new Runnable() {
public void run() {
+
+ try {
+ // 鑾峰彇閭�璇风爜锛氳嫢鏃犻個璇风爜涓斿瓨鍦ㄦ湁鏁堢殑闃熷憳鍏崇郴 鍒欒嚜鍔ㄧ敓鎴愰個璇风爜
+ userInfoExtraService.getUserInviteCode(uuser.getId());
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+
LogHelper.userInfo(GsonUtil.toJsonExpose(uuser));
uuser.setLastLoginIp(remotIP);
uuser.setLastLoginTime(java.lang.System.currentTimeMillis());
@@ -881,7 +906,7 @@
}
String minMoney = configService.get(EXTRACT_MIN_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶灏忛噾棰�
- String maxMoney = configService.get(EXTRACT_MAX_MONEY); // 鍗曠瑪鎻愮幇鐨勬渶澶ч噾棰�
+ String maxDayMoney = configService.get("extract_money_day"); // 姣忔棩鏈�澶ф彁鐜伴噾棰�
int maxDayCount = Integer.parseInt(configService.get("extract_count_day"));
ExtractRecord extractRecord = extractRecordService.getExtractRecordByUid(uid);
boolean canExtract = true;
@@ -890,9 +915,9 @@
canExtract = false;
errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s娆�", maxDayCount + "");
} else if (extractRecord != null
- && extractRecord.getMoney().add(money).compareTo(new BigDecimal(maxMoney)) > 0) {
+ && extractRecord.getMoney().add(money).compareTo(new BigDecimal(maxDayMoney)) > 0) {
canExtract = false;
- errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s鍏�", maxMoney);
+ errorMsg = String.format("姣忔棩鏈�澶氭彁鐜�%s鍏�", maxDayMoney);
} else if (new BigDecimal(minMoney).compareTo(money) > 0) {
canExtract = false;
errorMsg = String.format("姣忔鏈�浣庢彁鐜�%s鍏�", minMoney);
@@ -1283,6 +1308,12 @@
HttpServletRequest request, int type, PrintWriter out) {
UserInfo user = userInfoService.getUserById(uid);
if (user == null) {
+ user = userInfoService.getUserByIdWithMybatis(uid);
+ if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
+ out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
out.print(JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
return;
}
@@ -1832,52 +1863,71 @@
@RequestMapping(value = "getMyTeam", method = RequestMethod.POST)
public void getMyTeam(AcceptData acceptData, long page, long uid, long type, PrintWriter out) {
- int pageSize = Constant.PAGE_SIZE;
+ try {
+ int pageSize = Constant.PAGE_SIZE;
- JSONObject resultData = new JSONObject();
- if (type == 1) {
- resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
- } else if (type == 2) {
- resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
- }
+ JSONObject resultData = new JSONObject();
+ if (type == 1) {
+ resultData = threeSaleSerivce.getMyFirstTeam((page - 1) * pageSize, pageSize, uid);
+ } else if (type == 2) {
+ resultData = threeSaleSerivce.getMySecondTeam((page - 1) * pageSize, pageSize, uid);
+ }
- // 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
- String platform = acceptData.getPlatform();
- if ("android".equalsIgnoreCase(platform)) {
- long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
- long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
+ // 瀹夊崜绯荤粺杩斿洖鎵�鏈夋暟鎹�
+ String platform = acceptData.getPlatform();
+ if ("android".equalsIgnoreCase(platform)) {
+ long firstTeam = threeSaleSerivce.countFirstTeam(uid, 1);
+ long firstTeamTotal = threeSaleSerivce.countFirstTeam(uid, null);
- long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
- long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
+ long secondTeam = threeSaleSerivce.countSecondTeam(uid, 1);
+ long secondTeamTotal = threeSaleSerivce.countSecondTeam(uid, null);
- 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());
+ 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));
}
- 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 = "";
+ }
- 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("firstTeamTotal", firstTeamTotal);
+ resultData.put("secondTeam", secondTeam);
+ resultData.put("secondTeamTotal", secondTeamTotal);
+ resultData.put("boss", bossData);
}
- resultData.put("helpLink", helpLink);
- resultData.put("firstTeam", firstTeam);
- resultData.put("firstTeamTotal", firstTeamTotal);
- resultData.put("secondTeam", secondTeam);
- resultData.put("secondTeamTotal", secondTeamTotal);
- 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();
}
- out.print(JsonUtil.loadTrueResult(resultData));
+
}
/**
@@ -1922,12 +1972,11 @@
resultData.put("secondTeam", secondTeam);
resultData.put("secondTeamTotal", secondTeamTotal);
resultData.put("boss", bossData);
-
-
+
boolean hasCode = false;
String inviteCode = userInfoExtraService.getUserInviteCode(uid);
if (inviteCode != null && inviteCode.trim().length() > 0) {
- hasCode = true; // 宸叉湁閭�璇风爜
+ hasCode = true; // 宸叉湁閭�璇风爜
} else {
// 閭�璇锋縺娲婚摼鎺�
resultData.put("activationlink", configService.get("invite_activation_url"));
@@ -1935,14 +1984,14 @@
resultData.put("hasCode", hasCode);
out.print(JsonUtil.loadTrueResult(resultData));
-
+
} catch (UserInfoExtraException e) {
out.print(JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult("缁熻澶辫触"));
e.printStackTrace();
}
-
+
}
/**
--
Gitblit v1.8.0