From d4b3ee96ac6093683fce254541b113fb6a762060 Mon Sep 17 00:00:00 2001
From: hexiaohui <hexiaohui@LAPTOP-03V48RSB>
Date: 星期三, 03 四月 2019 23:07:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 158 +++++++++++++++++++++++-----------------------------
1 files changed, 71 insertions(+), 87 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index b54d921..f09adde 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -2,7 +2,6 @@
import java.io.IOException;
import java.io.PrintWriter;
-import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@@ -14,19 +13,18 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.dto.money.InviteGetMoney;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.admin.InviteGetMoney;
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.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.exception.NotExistObjectException;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
@@ -37,6 +35,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import net.sf.json.JSONArray;
@@ -53,10 +52,6 @@
@Controller
@RequestMapping("api/v1/invite")
public class InviteGetMoneyController {
-
- @Resource
- private InviteGetMoneyService inviteGetMoneyService;
-
@Resource
private SystemClientParamsService systemClientParamsService;
@@ -71,41 +66,27 @@
@Resource
private SwiperPictureService swiperPictureService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private UserInfoService userInfoService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@Resource
private RedisManager redisManager;
-
@RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST)
public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid)
- throws NotExistObjectException,UserInfoExtraException {
+ throws NotExistObjectException, UserInfoExtraException {
// 鏌ヨ鍟嗗搧鎬绘暟
Integer totalCount = 0;
int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE
: totalCount / Constant.PAGE_SIZE + 1;
PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage);
-
- /*
- * // 鍒嗛〉鏌ヨ閭�璇锋彁鎴愭 List<InviteGetMoney> inviteGetMoneyList =
- * inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, "");
- *
- * // 鍚嶅瓧*澶勭悊 for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {
- *
- * String name = inviteGetMoney.getName(); if (name != null) { if
- * (name.length() > 2) { name = Utils.getStarString(name, 1,
- * name.length() - 1); } else { name = name.substring(0, 1) + "**" +
- * name.substring(name.length() - 1); } } inviteGetMoney.setName(name);
- * inviteGetMoney.setRankIcon(UserUtil.getRankIcon(3)); }
- */
List<InviteGetMoney> inviteGetMoneyList = userRankingsService.getRank(0, 5);
@@ -114,37 +95,26 @@
data.put("everyDayTaskList", new JSONArray());
data.put("inviteGetMoneyList",
JSONArray.fromObject(JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList)));
- if (uid.equals("0") || uid == null) {
+ if (StringUtil.isNullOrEmpty(uid) || uid.equalsIgnoreCase("0")) {
data.put("myTeam", "---");
data.put("moneyToday", "---");
data.put("moneyMonth", "---");
data.put("moneyLastMonth", "---");
} else {
// 鎴戠殑闃熷憳
- int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid);
- int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid);
- int myTeamCount = myFirstTeamCount + mySecondTeamCount;
+ long myFirstTeamCount = threeSaleSerivce.getFirstUsersCount(Long.parseLong(uid));
+ long mySecondTeamCount = threeSaleSerivce.getSecondUsersCount(Long.parseLong(uid));
+ long myTeamCount = myFirstTeamCount + mySecondTeamCount;
data.put("myTeam", myTeamCount);
- // 浠婃棩 鏈湀棰勪及鏀剁泭
- BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + "");
- if (moneyToday == null) {
- moneyToday = new BigDecimal(0);
- }
- BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + "");
- if (moneyMonth == null) {
- moneyMonth = new BigDecimal(0);
- }
-
- BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + "");
-
- data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("moneyLastMonth", moneyLastMonth.toString());
+ // 1.5.0鍚庡凡缁忎笉浣跨敤姝ゅ瓧娈�
+ data.put("moneyToday", "0");
+ data.put("moneyMonth", "0");
+ data.put("moneyLastMonth", "0");
}
// 娲诲姩瑙勫垯
String key = "activityRules"; // key鍊�
- com.yeshi.fanli.entity.system.System system = new System();
+ BusinessSystem system = new BusinessSystem();
system.setCreatetime(java.lang.System.currentTimeMillis());
system.setPlatform(1);
system.setId(4L);
@@ -172,17 +142,21 @@
}
data.put("desc", configService.get("invite_desc"));
-
+
boolean hasCode = false;
if (uid != null && uid.trim().length() > 0) {
String inviteCode = userInfoExtraService.getUserInviteCode(Long.parseLong(uid));
if (inviteCode != null && inviteCode.trim().length() > 0) {
- hasCode = true; // 宸叉湁閭�璇风爜
+ hasCode = true; // 宸叉湁閭�璇风爜
}
}
- data.put("hasCode", hasCode);
-
+ // 閭�璇锋縺娲婚摼鎺�
+ if (!hasCode) {
+ data.put("activationlink", configService.get("invite_activation_url"));
+ }
+
+ data.put("hasCode", hasCode);
com.alibaba.fastjson.JSONObject root = new com.alibaba.fastjson.JSONObject();
root.put("code", 0);
@@ -212,7 +186,7 @@
// 閭�璇疯鍒�
String key = "inviteRules"; // key鍊�
- com.yeshi.fanli.entity.system.System system = new System();
+ com.yeshi.fanli.entity.system.BusinessSystem system = new BusinessSystem();
system.setCreatetime(java.lang.System.currentTimeMillis());
system.setPlatform(1);
system.setId(4L);
@@ -224,10 +198,10 @@
data.put("inviteRules", valueBr);
out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
}
-
-
+
/**
* 閭�璇锋縺娲�-鐗瑰埆鎻愮ず璇�
+ *
* @param callback
* @param out
*/
@@ -239,12 +213,12 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鎻愰啋"));
return;
}
-
+
JSONObject data = new JSONObject();
data.put("tip", tip);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇澶辫触"));
e.printStackTrace();
@@ -253,27 +227,31 @@
/**
* 婵�娲婚個璇�
+ *
* @param callback
- * @param uid 鐢ㄦ埛id
- * @param inviteCode 閭�璇峰槢
+ * @param uid
+ * 鐢ㄦ埛id
+ * @param inviteCode
+ * 閭�璇峰槢
* @param out
*/
@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("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
+
String newCode = userInfoExtraService.activateInviteCode(uid, inviteCode);
if (newCode == null || newCode.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("婵�娲诲け璐�"));
return;
}
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("婵�娲绘垚鍔�"));
-
+
} catch (UserInfoExtraException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
@@ -281,67 +259,70 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鑾峰彇閭�璇风爜
+ *
* @param callback
- * @param uid 鐢ㄦ埛id
+ * @param uid
+ * 鐢ㄦ埛id
* @param out
*/
@RequestMapping(value = "getInviteCode")
public void getInviteCode(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
try {
-
+
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
if (userInfoExtra == null || userInfoExtra.getInviteCode() == null) {
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("tip", tip);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇鏁版嵁澶辫触"));
e.printStackTrace();
- }
+ }
}
-
+
/**
* 鑾峰彇閭�璇风煭杩炴帴
+ *
* @param callback
- * @param uid 鐢ㄦ埛id
+ * @param uid
+ * 鐢ㄦ埛id
* @param out
*/
@RequestMapping(value = "getShortLink")
public void getShortLink(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
try {
-
+
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
+
String inviteShortLink = redisManager.getInviteShortLink(uid);
if (inviteShortLink != null && inviteShortLink.trim().length() > 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇�1鍒嗛挓鍚庡啀璇�"));
return;
}
-
+
String shortLink = UserUtil.getInviteShortLink(uid);
// 缂撳瓨1鍒嗛挓
redisManager.setInviteShortLink(uid, shortLink);
-
+
JSONObject data = new JSONObject();
data.put("shortLink", shortLink);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -350,22 +331,24 @@
e.printStackTrace();
}
}
-
+
/**
* 鑾峰彇閭�璇风數璇濆彿鐮�
+ *
* @param callback
- * @param uid 鐢ㄦ埛id
+ * @param uid
+ * 鐢ㄦ埛id
* @param out
*/
@RequestMapping(value = "getUserPhone")
public void getUserPhone(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
try {
-
+
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
+
UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null || userInfo.getPhone() == null || userInfo.getPhone().trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛湭缁戝畾鐢佃瘽鍙风爜"));
@@ -374,15 +357,16 @@
JSONObject data = new JSONObject();
data.put("phone", userInfo.getPhone());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇鏁版嵁澶辫触"));
e.printStackTrace();
}
}
-
+
/**
* 鑾峰彇鐢ㄦ埛閭�璇蜂笂绾�
+ *
* @param callback
* @param uid
* @param out
@@ -393,14 +377,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉姝ｇ‘"));
return;
}
-
+
try {
ThreeSale threeSale = threeSaleSerivce.getMyBoss(uid);
if (threeSale == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "鏃犱笂绾ч個璇蜂汉"));
return;
}
-
+
UserInfo boss = threeSale.getBoss();
if (boss == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓婄骇閭�璇蜂汉鑾峰彇澶辫触"));
@@ -410,13 +394,13 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
Long createTime = threeSale.getCreateTime();
Date inviteTime = new Date(createTime);
-
+
JSONObject data = new JSONObject();
data.put("nickName", boss.getNickName());
data.put("portrait", boss.getPortrait());
data.put("inviteTime", sdf.format(inviteTime));
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鑾峰彇鏁版嵁澶辫触"));
e.printStackTrace();
--
Gitblit v1.8.0