From 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 11:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 548 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 489 insertions(+), 59 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
index bb0886a..0a7b98d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -6,6 +6,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -23,15 +24,23 @@
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
+import com.yeshi.fanli.dto.user.UserInviteLevelEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
+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.bus.user.UserInviteValidNum;
+import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
+import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;
import com.yeshi.fanli.entity.push.DeviceActive;
import com.yeshi.fanli.entity.shop.BanLiShopOrder;
import com.yeshi.fanli.entity.system.BusinessSystem;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;
import com.yeshi.fanli.log.LogHelper;
@@ -41,7 +50,10 @@
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.UserMoneyService;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.LostOrderService;
+import com.yeshi.fanli.service.inter.order.OrderMoneyDailyCountService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
@@ -66,7 +78,11 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.inter.user.integral.IntegralDetailService;
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
+import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;
+import com.yeshi.fanli.service.inter.user.vip.TearcherService;
import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -76,6 +92,7 @@
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
@@ -192,6 +209,29 @@
@Resource
private UserMoneyDetailService userMoneyDetailService;
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
+
+ @Resource
+ private TearcherService tearcherService;
+
+ @Resource
+ private UserVIPPreInfoService userVIPPreInfoService;
+
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
+
+ @Resource
+ private OrderMoneyDailyCountService orderMoneyDailyCountService;
+
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -231,6 +271,7 @@
} else {
JSONObject data = new JSONObject();
data.put("userInfo", UserUtil.filterForClientUser(userInfo));
+ data.put("inviteCode", userInfoExtraService.getInviteCodeByUid(userInfo.getId()));
out.print(JsonUtil.loadTrueResult(data));
final UserInfo uuser = userInfo;
@@ -264,10 +305,17 @@
object.put("code", errorCode);
object.put("data", data);
out.print(object.toString());
+ } else if (errorCode == 102) { // 闇�瑕佺粦瀹氬井淇″彿
+ JSONObject data = new JSONObject();
+ data.put("key", e.getMsg());
+ JSONObject object = new JSONObject();
+ object.put("code", errorCode);
+ object.put("data", data);
+ out.print(object.toString());
} else {
out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
try {
- LogHelper.cookieLog("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
+ LogHelper.error("鐧诲綍鍑洪敊:" + e.getCode() + "-" + e.getMessage());
} catch (Exception e1) {
e1.printStackTrace();
}
@@ -341,6 +389,50 @@
}
}
+
+
+ /**
+ * 缁戝畾寰俊V2.1.3 鐢佃瘽鍙风爜 鐧诲綍
+ *
+ * @param acceptData
+ * @param vcode
+ * @param phone
+ * @param out
+ */
+ @RequestSerializableByKey(key = "'bindWXLogin-'+#code")
+ @RequestMapping(value = "bindWXLogin")
+ public void bindWXLogin(AcceptData acceptData, Long uid, String code, String key, HttpServletRequest request,
+ PrintWriter out) {
+ BusinessSystem system = businessSystemService.getBusinessSystemCache(acceptData.getPlatform(),
+ acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult("绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(code)) {
+ out.print(JsonUtil.loadFalseResult("璇蜂笂浼燾ode"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(key)) {
+ out.print(JsonUtil.loadFalseResult("key鍊间笉鑳戒负绌�"));
+ return;
+ }
+
+ try {
+ UserInfo userInfo = userAccountService.bindWXToLogin(request, acceptData, code, system.getAppid(), key);
+ JSONObject data = new JSONObject();
+ data.put("userInfo", UserUtil.filterForClientUser(userInfo));
+ out.print(JsonUtil.loadTrueResult(data));
+ } catch (UserAccountException e) {
+ out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
+ }
+
+ }
+
+
+
/**
* 缁戝畾鐢佃瘽鍙风爜 V2.0.1 寰俊鐧诲綍
*
@@ -388,7 +480,7 @@
vo.setNickName(userInfo.getNickName());
vo.setPortrait(userInfo.getPortrait());
vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
- vo.setCsdLink(configService.get("customer_service_link"));
+ vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
Date now = new Date();
Date start = new Date(0);
@@ -440,16 +532,34 @@
}
vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
-
List<Integer> list = new ArrayList<Integer>();
list.add(BanLiShopOrder.STATE_SUCCESS);
BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
vo.setFinishGoldCoin(Long.parseLong(integralDetailService.getCumulativeMoney(uid).setScale(0).toString()));
- vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney));
+
+ // vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,
+ // , payMoney));
+
+ int finishTeam = 0;
+ long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);
+ if (listThreeSale != null && listThreeSale.size() > 0) {
+ for (ThreeSale three : listThreeSale) {
+ UserInfo worker = three.getWorker();
+ if (worker == null || worker.getId() == null) {
+ continue;
+ }
+ // 1銆侀個璇峰叧绯绘垚鍔熷悗锛�2銆佸崟锛堝垎浜� + 鑷喘锛夊疄浠樻澶т簬1鍏�
+ long countValid = commonOrderService.countOrderByUidAndSettled(worker.getId(), payMoney);
+ if (countValid > 0) {
+ finishTeam++;
+ }
+ }
+ }
+ vo.setFinishTeam(finishTeam);
vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
-
// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
@@ -507,58 +617,6 @@
return;
}
- UserInfo userInfo = userInfoService.selectByPKey(uid);
- if (userInfo == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
- return;
- }
-
- // 鐪侀挶 -鑷喘浜х敓杩斿埄
-
- List<Integer> list = new ArrayList<Integer>();
- list.add(BanLiShopOrder.STATE_SUCCESS);
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-
- BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);
- long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);
- long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
- BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
-
- long limitTeam = 0;
-
- // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
- String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
- Date executeDate = null;
- try {
- SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");
- executeDate = format.parse(limtDate);
- } catch (ParseException e) {
- e.printStackTrace();
- }
-
- UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
- if (extra != null
- && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
- limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));
- } else {
- limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));
- }
- long limitHongBao = (Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
- BigDecimal limitMoney = (new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
- BigDecimal limitgoldCoin = (new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));
-
- if (finishGoldCoin.compareTo(limitgoldCoin) >= 0 && finishTeam >= limitTeam && finishHongBao >= limitHongBao
- && finishMoney.compareTo(limitMoney) >= 0) {// 鏉′欢绗﹀悎
- ;
- } else {
- if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈揪鍒板紑閫氭潯浠�")));
- } else {
- out.print(JsonUtil.loadFalseResult("鏈揪鍒板紑閫氭潯浠�"));
- }
- return;
- }
- // 寮�閫�
try {
userVIPInfoService.applyVIP(uid);
} catch (UserVIPInfoException e) {
@@ -571,10 +629,382 @@
}
if (!StringUtil.isNullOrEmpty(callback)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑")));
} else {
- out.print(JsonUtil.loadTrueResult(""));
+ out.print(JsonUtil.loadTrueResult("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑"));
}
}
+ /**
+ * 鑾峰彇vip淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getVIPInfoV2")
+ public void getVIPInfoV2(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ // 鐢ㄦ埛淇℃伅
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
+ return;
+ }
+ // 鑾峰彇绛夌骇
+ UserInviteLevelEnum level = userInviteService.getUserInviteLevelNew(uid);
+
+ // 杈句汉
+ long limitOrder = 0;
+ long limitFirst = 0;
+ long limitSecond = 0;
+ if (level == UserInviteLevelEnum.actived || level == UserInviteLevelEnum.noActive) {
+ String orderCount = userVipConfigService.getValueByKey("vip_pre_7_order_count");
+ if (!StringUtil.isNullOrEmpty(orderCount)) {
+ limitOrder = Long.parseLong(orderCount);
+ }
+ String first = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+ String second = userVipConfigService.getValueByKey("vip_pre_7_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+ } else if (level == UserInviteLevelEnum.highVIP || level == UserInviteLevelEnum.vipApply) {
+ String orderCount = userVipConfigService.getValueByKey("vip_pre_10_order_count");
+ if (!StringUtil.isNullOrEmpty(orderCount)) {
+ limitOrder = Long.parseLong(orderCount);
+ }
+ String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");
+ if (!StringUtil.isNullOrEmpty(first)) {
+ limitFirst = Long.parseLong(first);
+ }
+ String second = userVipConfigService.getValueByKey("vip_pre_10_second_level_team_count");
+ if (!StringUtil.isNullOrEmpty(second)) {
+ limitSecond = Long.parseLong(second);
+ }
+ } else if (level == UserInviteLevelEnum.vip || level == UserInviteLevelEnum.tearcherApply) {
+ // TODO 姣斾緥
+
+ } else if (level == UserInviteLevelEnum.tearcher) {
+ // TODO
+ }
+
+ // 鑷喘璁㈠崟
+ long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);
+ // 鏈夋晥绮変笣
+ int doneFirst = 0;
+ int doneSecond = 0;
+ UserInviteValidNum userInviteValidNum = userInviteValidNumService.selectByPrimaryKey(uid);
+ if (userInviteValidNum != null) {
+ doneFirst = userInviteValidNum.getNumFirst() == null ? 0 : userInviteValidNum.getNumFirst();
+ doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();
+ }
+
+ Date now = new Date();
+ Date start = new Date(0);
+ // 鐪侀挶锛� ---杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+ List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();
+ typeFanli.add(UserMoneyDetailTypeEnum.fanli);
+ typeFanli.add(UserMoneyDetailTypeEnum.orderReward);
+ BigDecimal saveMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeFanli, start, now).abs();
+
+ // 璧氶挶锛� 閭�璇疯鍗曘�佸垎浜鍗曘�佽ˉ璐�
+ List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();
+ typeList.add(UserMoneyDetailTypeEnum.share);
+ typeList.add(UserMoneyDetailTypeEnum.invite);
+ typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);
+ typeList.add(UserMoneyDetailTypeEnum.systemEqualize);
+ typeList.add(UserMoneyDetailTypeEnum.subsidy);
+ BigDecimal earnMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();
+ if (level != UserInviteLevelEnum.vip) {
+ BigDecimal rate = new BigDecimal("0.409");
+ saveMoney = MoneyBigDecimalUtil.mul2(saveMoney, rate);
+ earnMoney = MoneyBigDecimalUtil.mul2(earnMoney, rate);
+ }
+
+ String shareRate = "鍙韩浣ｉ噾鐨�<label style=\"color:#E5005C;\">%s</label>";
+ String teamRate = "鏈�楂樹剑閲戠殑<label style=\"color:#E5005C;\">%s</label>";
+ // 杈句汉鐗�
+ JSONObject jsonrRed1 = new JSONObject();
+ jsonrRed1.put("enjoyRate", String.format(shareRate, "145%"));
+ jsonrRed1.put("teamRate", String.format(teamRate, "25%"));
+ jsonrRed1.put("teamIncome", "楂樼骇浼氬憳浠ヤ笂涓撳睘");
+
+ // 楂樼骇浼氬憳
+ JSONObject jsonrRed2 = new JSONObject();
+ jsonrRed2.put("enjoyRate", String.format(shareRate, "195%"));
+ jsonrRed2.put("teamRate", String.format(teamRate, "50%"));
+ jsonrRed2.put("teamIncome", "浜珮绾у洟闃熸敹鐩�");
+
+ // 瓒呯骇浼氬憳
+ JSONObject jsonrRed3 = new JSONObject();
+ jsonrRed3.put("enjoyRate", String.format(shareRate, "210%"));
+ jsonrRed3.put("teamRate", String.format(teamRate, "110%"));
+ jsonrRed3.put("teamIncome", "浜秴绾у洟闃熸敹鐩�");
+
+ JSONObject json = new JSONObject();
+ json.put("level", level.name());
+ json.put("nickName", userInfo.getNickName());
+ json.put("portrait", userInfo.getPortrait());
+ json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));
+ json.put("saveMoney", saveMoney);
+ json.put("earnMoney", earnMoney);
+
+ String tearcherWX = "";
+ TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);
+ if (tearcherInfo != null && !StringUtil.isNullOrEmpty(tearcherInfo.getWxID())) {
+ tearcherWX = tearcherInfo.getWxID();
+ }
+ json.put("tearcherWX", tearcherWX);
+ json.put("tearcherTip", "鎴戞槸浣犵殑瀵煎笀锛屼负浣犲湪鐪佽禋杩囩▼涓В闅剧瓟鐤戯紝瀵逛綘涓�瀵逛竴杈呭锛屽�惧惉浣犵殑闇�姹傛�荤粨骞跺弽棣堢粰鏉挎牀蹇渷瀹樻柟杩愯惀鍥㈤槦锛屽揩鏉ユ坊鍔犳垜鍚с��");
+ json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
+
+ // 宸插畬鎴�
+ json.put("doneOrder", doneOrder);
+ json.put("doneFirst", doneFirst);
+ json.put("doneSecond", doneSecond);
+
+ // 鏍囧噯
+ json.put("limitOrder", limitOrder);
+ json.put("limitFirst", limitFirst);
+ json.put("limitSecond", limitSecond);
+
+ // 宸插畬鎴�
+ json.put("daRen", jsonrRed1);
+ json.put("highVIP", jsonrRed2);
+ json.put("superVIP", jsonrRed3);
+
+ // 浜哄伐瀹㈡湇閾炬帴
+ json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+
+ UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
+ String leftTime = "";
+ if (userVIPInfo != null && userVIPInfo.getState() == UserVIPInfo.STATE_VERIFING
+ && userVIPInfo.getApplyTime() != null) {
+ long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);
+ if (s > 3600) {
+ leftTime = s / 3600 + "灏忔椂";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s >= 60) {
+ leftTime = s / 60 + "鍒嗛挓";
+ leftTime = "杩樺墿" + leftTime;
+ } else if (s > 0) {
+ leftTime = s + "绉�";
+ leftTime = "杩樺墿" + leftTime;
+ } else {
+ leftTime = "杩樺墿0绉�";
+ }
+ }
+ json.put("leftTime", leftTime);
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(json));
+ }
+ }
+
+ /**
+ * 鑾峰彇vip淇℃伅
+ *
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "getVIPSuccessInfo")
+ public void getVIPSuccessInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserVIPPreInfo vipInfo = userVIPPreInfoService.getLatestProcessInfo(uid);
+ if (vipInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "杩樻湭鍗囩骇鎴愪负浼氬憳"));
+ return;
+ }
+
+ UserLevelEnum level = UserLevelUtil.getByLevel(vipInfo.getProcess());
+ if (level == null) {
+ level = UserLevelEnum.daRen;
+ }
+ UserLevelEnum showLevel = UserLevelUtil.getShowLevel(level);
+
+ String desc = "浣犱簬" + TimeUtil.formatDateDot(vipInfo.getCreateTime()) + "鍗囩骇涓�" + showLevel.getName();
+
+ JSONObject json = new JSONObject();
+ json.put("desc", desc);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));
+ }
+
+ @RequestMapping(value = "getTearcherWX")
+ public void getTearcherWX(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+ TearcherInfo tearcher = tearcherService.selectByUid(uid);
+ if (tearcher == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏃犲甯�"));
+ return;
+ } else {
+ JSONObject data = new JSONObject();
+ data.put("wx", tearcher.getWxID());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ return;
+ }
+ }
+
+ //鑾峰彇鐢佃瘽鍙风爜
+ @RequestMapping(value = "getPhone")
+ public void getPhone(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
+ if (uid == null || uid <= 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+ UserInfo user = userInfoService.selectAvailableByPrimaryKey(uid);
+ if(user==null){
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(2, "鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ JSONObject data=new JSONObject();
+ data.put("phone", user.getPhone());
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+
+ /**
+ * 璐︽埛娉ㄩ攢
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping("accountRemove")
+ public void accountRemove(AcceptData acceptData, String callback, Long uid, String vcode, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ if (StringUtil.isNullOrEmpty(vcode)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇疯緭鍏ラ獙璇佺爜"));
+ return;
+ }
+
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ if (userInfo == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ if (userInfo.getState() == UserInfo.STATE_FORBIDDEN) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+
+ if (userInfo.getState() == UserInfo.STATE_DELETE || userInfo.getState() == UserInfo.STATE_DELETE_OUT_OF_DATE) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, "甯愭埛宸茶娉ㄩ攢锛岃閲嶆柊鐧诲綍"));
+ return;
+ }
+
+ String phone = userInfo.getPhone();
+ if (StringUtil.isNullOrEmpty(phone)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈粦瀹氭湁鏁堢數璇濆彿鐮�"));
+ return;
+ }
+
+ if (!Constant.IS_TEST) {
+ String oldVcode = redisManager.getSMSVCode(phone, SMSHistory.TYPE_REMVOE);
+ if (StringUtil.isNullOrEmpty(oldVcode) || !oldVcode.equalsIgnoreCase(vcode)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("楠岃瘉鐮侀敊璇紝閲嶆柊杈撳叆"));
+ return;
+ }
+ redisManager.clearSMSVCode(phone, SMSHistory.TYPE_REMVOE);
+ }
+
+ UserInfo user = new UserInfo(uid);
+ user.setState(UserInfo.STATE_DELETE);
+ user.setStateDesc("鐢ㄦ埛涓诲姩娉ㄩ攢璐︽埛");
+ userInfoService.updateByPrimaryKeySelective(user);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娉ㄩ攢鎴愬姛"));
+ }
+
+
+ /**
+ * 娉ㄩ攢璐︽埛鏁版嵁
+ * @param acceptData
+ * @param callback
+ * @param uid
+ * @param out
+ */
+ @RequestMapping("getAccountData")
+ public void getAccountData(AcceptData acceptData, String callback, Long uid, PrintWriter out) {
+ if (uid == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
+ return;
+ }
+
+ UserInfo user = userInfoService.getUserById(uid);
+ if (user == null) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
+ }
+
+ Date minDate = null;
+ Date maxDate = null;
+ long timeStamp = System.currentTimeMillis();
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTimeInMillis(timeStamp);
+
+ // 鍏ㄩ儴鏈埌璐�
+ minDate = new Date(0);
+ maxDate = new Date(timeStamp);
+ BigDecimal totalMoney = hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate);
+ if (totalMoney == null)
+ totalMoney = BigDecimal.ZERO;
+ totalMoney = totalMoney.add(user.getMyHongBao());
+
+ // 鏈湀棰勪及
+ maxDate = new Date(timeStamp);
+ calendar = Calendar.getInstance();
+ minDate = new Date(TimeUtil.convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ calendar.add(Calendar.MONTH, -1);
+ BigDecimal monthMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));
+
+ // 涓婃湀棰勪及
+ maxDate = new Date(TimeUtil
+ .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ calendar.add(Calendar.MONTH, -1);
+ minDate = new Date(TimeUtil
+ .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));
+ BigDecimal lastMoney = getMoney(orderMoneyDailyCountService.query(uid, minDate, maxDate));
+
+ JSONObject data = new JSONObject();
+ data.put("totalMoney", totalMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("monthMoney", monthMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("lastMoney", lastMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("link", configService.get(ConfigKeyEnum.accountLogoutProtocolLink.getKey()));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ }
+
+ private BigDecimal getMoney(List<OrderMoneyDailyCount> list) {
+ BigDecimal money = BigDecimal.ZERO;
+ BigDecimal hundred = BigDecimal.valueOf(100);
+ if (list != null && list.size() > 0) {
+ for (OrderMoneyDailyCount dailyCount : list) {
+ if (dailyCount.getIncome() != null)
+ money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));
+ if (dailyCount.getIncomeTeam() != null)
+ money = money.add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));
+ }
+ }
+ return money;
+ }
}
--
Gitblit v1.8.0