From 393e3a365b5ebbed6e9eef07fbd18881cde73711 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:51:04 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 250 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 246 insertions(+), 4 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 d4178a3..888c7b1 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
@@ -23,10 +23,14 @@
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.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.UserVIPInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
import com.yeshi.fanli.entity.push.DeviceActive;
@@ -67,6 +71,8 @@
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.UserVIPInfoService;
import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
@@ -193,6 +199,13 @@
@Resource
private UserMoneyDetailService userMoneyDetailService;
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private UserInviteValidNumService userInviteValidNumService;
+
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -447,8 +460,27 @@
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 = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);
+ if (countValid > 0) {
+ finishTeam ++;
+ }
+ }
+ }
+ vo.setFinishTeam(finishTeam);
vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
// 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
@@ -521,8 +553,27 @@
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 = 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);
@@ -579,4 +630,195 @@
}
}
+
+
+ /**
+ * 鑾峰彇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 limitZiGou = 0;
+ long limitShare = 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 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.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);
+ }
+ 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 姣斾緥
+ 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);
+
+ // 鏈夋晥绮変笣
+ 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();
+ }
+
+ // 鐪侀挶锛� ---杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+ 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);
+ }
+
+
+ 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("tearcherTip", "瀵煎笀鎸夐挳锛氬脊妗嗗唴瀹�");
+ json.put("saveMoney", saveMoney);
+ json.put("earnMoney", earnMoney);
+
+ // 宸插畬鎴�
+ json.put("doneZiGou", doneZiGou);
+ json.put("doneShare", doneShare);
+ json.put("doneFirst", doneFirst);
+ json.put("doneSecond", doneSecond);
+
+ // 鏍囧噯
+ json.put("limitZiGou", limitZiGou);
+ json.put("limitShare", limitShare);
+ 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("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
+ } else {
+ out.print(JsonUtil.loadTrueResult(json));
+ }
+ }
+
}
--
Gitblit v1.8.0