From 24a8d17e007545f7426c48352109aa1a9c6587ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 06 五月 2020 12:02:09 +0800
Subject: [PATCH] IOS上线隐藏我的界面的banner与超级会员升级信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 234 +++++++++++++++++++---------------------------------------
1 files changed, 77 insertions(+), 157 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 888c7b1..ad08e56 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
@@ -25,12 +25,12 @@
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.HongBaoV2;
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.UserVIPInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.push.DeviceActive;
@@ -46,6 +46,7 @@
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.LostOrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.push.DeviceActiveService;
@@ -73,6 +74,7 @@
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.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
@@ -204,6 +206,12 @@
@Resource
private UserInviteValidNumService userInviteValidNumService;
+
+ @Resource
+ private CommonOrderService commonOrderService;
+
+ @Resource
+ private TearcherService tearcherService;
/**
@@ -474,7 +482,7 @@
continue;
}
// 1銆侀個璇峰叧绯绘垚鍔熷悗锛�2銆佸崟锛堝垎浜� + 鑷喘锛夊疄浠樻澶т簬1鍏�
- long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
+ long countValid = commonOrderService.countOrderByUidAndSettled(worker.getId(), payMoney);
if (countValid > 0) {
finishTeam ++;
}
@@ -539,79 +547,7 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
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 finishTeam = 0L;
- 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 = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
- if (countValid > 0) {
- finishTeam ++;
- }
- }
- }
-
- 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) {
@@ -624,9 +560,9 @@
}
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("鐢宠鎴愬姛锛屾鍦ㄥ彈鐞嗕腑"));
}
}
@@ -656,51 +592,13 @@
UserInviteLevelEnum level = userInviteService.getUserInviteLevelNew(uid);
// 杈句汉
- long limitZiGou = 0;
- long limitShare = 0;
+ long limitOrder = 0;
long limitFirst = 0;
long limitSecond = 0;
- String school = "鏉挎牀瀛﹂櫌";
- String platformSubsidy = "琛ヨ创杩斾剑 ";
- String teamSubsidy = "浼氬憳涓撳睘";
- String teamReward = "瓒呯骇浼氬憳涓撳睘";
if (level == UserInviteLevelEnum.actived || level == UserInviteLevelEnum.noActive) {
- // TODO 姣斾緥
- school += "杈句汉鐝�";
- platformSubsidy += "<label style=\"color:#E5005C;\">52.5%</label>";
-
-
- String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count");
- if (!StringUtil.isNullOrEmpty(zigou)) {
- limitZiGou = Long.parseLong(zigou);
- }
- String share = userVipConfigService.getValueByKey("vip_pre_3_share_order_count");
- if (!StringUtil.isNullOrEmpty(share)) {
- limitShare = Long.parseLong(share);
- }
- String first = userVipConfigService.getValueByKey("vip_pre_3_first_level_team_count");
- if (!StringUtil.isNullOrEmpty(first)) {
- limitFirst = Long.parseLong(first);
- }
- String second = userVipConfigService.getValueByKey("vip_pre_3_second_level_team_count");
- if (!StringUtil.isNullOrEmpty(second)) {
- limitSecond = Long.parseLong(second);
- }
- } else if (level == UserInviteLevelEnum.vipPre1) {
-
- // TODO 姣斾緥
- school += "鏅�氱彮";
- platformSubsidy += "<label style=\"color:#E5005C;\">60%</label>";
- teamSubsidy = "浼氬憳涓撳睘鏈�楂�<label style=\"color:#E5005C;\">7.5%</label>";
-
-
- String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");
- if (!StringUtil.isNullOrEmpty(zigou)) {
- limitZiGou = Long.parseLong(zigou);
- }
- String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count");
- if (!StringUtil.isNullOrEmpty(share)) {
- limitShare = Long.parseLong(share);
+ 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)) {
@@ -710,18 +608,10 @@
if (!StringUtil.isNullOrEmpty(second)) {
limitSecond = Long.parseLong(second);
}
- } else if (level == UserInviteLevelEnum.vipPre2 || level == UserInviteLevelEnum.vipApply) {
- school += "楂樼骇鐝�";
- platformSubsidy += "<label style=\"color:#E5005C;\">70%</label>";
- teamSubsidy = "浼氬憳涓撳睘鏈�楂�<label style=\"color:#E5005C;\">15%</label>";
-
- String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");
- if (!StringUtil.isNullOrEmpty(zigou)) {
- limitZiGou = Long.parseLong(zigou);
- }
- String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");
- if (!StringUtil.isNullOrEmpty(share)) {
- limitShare = Long.parseLong(share);
+ } 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)) {
@@ -733,26 +623,13 @@
}
} else if (level == UserInviteLevelEnum.vip || level == UserInviteLevelEnum.tearcherApply) {
// TODO 姣斾緥
- school += "瓒呯骇鐝�";
- platformSubsidy += "<label style=\"color:#E5005C;\">115%</label>";
- teamSubsidy = "浼氬憳涓撳睘鏈�楂�<label style=\"color:#E5005C;\">22.5%</label>";
- teamReward = "瓒呯骇浼氬憳涓撳睘鏈�楂�<label style=\"color:#E5005C;\">40%</label>";
} else if (level == UserInviteLevelEnum.tearcher) {
// TODO
}
- // 閭�璇疯鍗�
- long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
- HongBaoV2.TYPE_ZIGOU);
- // 閭�璇疯鍗�
- long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,
- HongBaoV2.TYPE_SHARE_GOODS);
-
-
- Date now = new Date();
- Date start = new Date(0);
-
+ // 鑷喘璁㈠崟
+ long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);
// 鏈夋晥绮変笣
int doneFirst = 0;
int doneSecond = 0;
@@ -762,6 +639,8 @@
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);
@@ -776,12 +655,31 @@
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();
@@ -789,31 +687,53 @@
json.put("nickName", userInfo.getNickName());
json.put("portrait", userInfo.getPortrait());
json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));
- json.put("tearcherTip", "瀵煎笀鎸夐挳锛氬脊妗嗗唴瀹�");
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("doneZiGou", doneZiGou);
- json.put("doneShare", doneShare);
+ json.put("doneOrder", doneOrder);
json.put("doneFirst", doneFirst);
json.put("doneSecond", doneSecond);
// 鏍囧噯
- json.put("limitZiGou", limitZiGou);
- json.put("limitShare", limitShare);
+ json.put("limitOrder", limitOrder);
json.put("limitFirst", limitFirst);
json.put("limitSecond", limitSecond);
- // 鏂囧瓧鍐呭
- json.put("platformSubsidy", platformSubsidy);
- json.put("school", school);
- json.put("teamSubsidy", teamSubsidy);
- json.put("teamReward", teamReward);
-
+ // 宸插畬鎴�
+ 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;
+ }
+ }
+ json.put("leftTime", leftTime);
+
if (!StringUtil.isNullOrEmpty(callback)) {
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
} else {
--
Gitblit v1.8.0