From dd9fd78aec975c29d6c5ea4c802aca2b7f773d91 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 27 二月 2020 14:00:43 +0800
Subject: [PATCH] 转链修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 237 insertions(+), 63 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 9d1c062..d4178a3 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
@@ -1,8 +1,12 @@
package com.yeshi.fanli.controller.client.v2;
import java.io.PrintWriter;
+import java.lang.reflect.Type;
import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
@@ -13,19 +17,30 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.JsonUtil;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.SMSHistory;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;
+import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
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;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
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.LostOrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
@@ -33,6 +48,7 @@
import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
+import com.yeshi.fanli.service.inter.push.DeviceTokenXMService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
@@ -44,6 +60,7 @@
import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoModifyRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsRecordService;
@@ -51,13 +68,16 @@
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.vip.UserVIPInfoService;
+import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.user.UserVipRateVO;
import net.sf.json.JSONObject;
@@ -105,6 +125,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenXMService deviceTokenXMService;
+
+ @Resource
private DeviceTokenVIVOService deviceTokenVIVOService;
@Resource
@@ -145,22 +168,31 @@
@Resource
private BindRemindService bindRemindService;
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
-
+
@Resource
private HongBaoV2CountService hongBaoV2CountService;
-
+
@Resource
private IntegralDetailService integralDetailService;
-
+
@Resource
private BanLiShopOrderService banLiShopOrderService;
@Resource
private ConfigService configService;
-
+
+ @Resource
+ private UserVipConfigService userVipConfigService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -200,6 +232,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;
@@ -218,6 +251,7 @@
if (active != null) {
deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
}
}
});
@@ -235,7 +269,7 @@
} 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();
}
@@ -328,81 +362,221 @@
out.print(JsonUtil.loadTrueResult("璁板綍鎴愬姛"));
}
-
/**
* 鑾峰彇vip淇℃伅
+ *
* @param acceptData
* @param uid
* @param out
*/
@RequestMapping(value = "getVIPInfo")
- public void getVIPInfo(AcceptData acceptData, Long uid, PrintWriter out) {
+ public void getVIPInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {
if (uid == null || uid <= 0) {
- out.print(JsonUtil.loadFalseResult("鐢ㄦ埛id涓虹┖"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
UserInfo userInfo = userInfoService.selectByPKey(uid);
if (userInfo == null) {
- out.print(JsonUtil.loadFalseResult("璇ョ敤鎴蜂笉瀛樺湪"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "璇ョ敤鎴蜂笉瀛樺湪"));
return;
}
-
- JSONObject data = new JSONObject();
- data.put("id", uid);
- data.put("nickName", userInfo.getNickName());
- data.put("portrait", userInfo.getPortrait());
-
+ //
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+
+ UserVipRateVO vo = new UserVipRateVO();
+ vo.setId(uid);
+ vo.setInviteCode(inviteCode);
+ vo.setNickName(userInfo.getNickName());
+ vo.setPortrait(userInfo.getPortrait());
+ vo.setHelpLink(userVipConfigService.getValueByKey("help_link_vip_h5"));
+ vo.setCsdLink(configService.get(ConfigKeyEnum.customerServiceLink.getKey()));
+
+ Date now = new Date();
+ Date start = new Date(0);
+
+ // 杩斿埄璁㈠崟銆佸鍔卞埜鎻愭垚
+ List<UserMoneyDetailTypeEnum> typeFanli = new ArrayList<>();
+ typeFanli.add(UserMoneyDetailTypeEnum.fanli);
+ typeFanli.add(UserMoneyDetailTypeEnum.orderReward);
+ BigDecimal finishMoney = 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 rewardMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();
+
UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);
- boolean vip = false;
- if (userVIPInfo != null && userVIPInfo.getState() != null
- && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) {
- vip = true;
- data.put("applyTime", userVIPInfo.getSuccessTime());
- }
- data.put("vip", vip);
-
- // 鐪侀挶 -鑷喘浜х敓杩斿埄
- BigDecimal rewardPurchase = hongBaoV2CountService.getRewardMoneyBySelf(uid);
- data.put("rurchaseReward", rewardPurchase.setScale(2));
-
- BigDecimal conserveMoney = rewardPurchase;
- if (!vip) { // 灏戠渷閽憋細 鑷喘浜х敓杩斿埄 * 5/12
- BigDecimal rate1 = new BigDecimal(5);
- BigDecimal rate2 = new BigDecimal(12);
- conserveMoney = MoneyBigDecimalUtil.mul2(rewardPurchase, MoneyBigDecimalUtil.div(rate1, rate2));
+ vo.setVipInfo(userVIPInfo);
+ String leftTime = "";
+ if (userVIPInfo != null && userVIPInfo.getApplyTime() != null) {
+ // TODO 璁＄畻鏃堕棿
+ 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;
+ }
}
- data.put("conserveMoney", conserveMoney.setScale(2));
-
- // 鍒嗕韩璧�
- BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);
- // 閭�璇疯禋
- BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);
-
- BigDecimal earnMoney = rewardShare;
- if (vip) { // 璧氶挶=鍒嗕韩+閭�璇�
- earnMoney = MoneyBigDecimalUtil.add(rewardShare, rewardInvite );
- } else { // 灏戣禋閽憋細 鍒嗕韩璧�* 5/12
- BigDecimal rate1 = new BigDecimal(5);
- BigDecimal rate2 = new BigDecimal(12);
- earnMoney = MoneyBigDecimalUtil.mul2(rewardShare, MoneyBigDecimalUtil.div(rate1, rate2));
+ vo.setLeftTime(leftTime);
+
+ if (userVIPInfo != null && userVIPInfo.getState() != null
+ && userVIPInfo.getState() == UserVIPInfo.STATE_SUCCESS) { // VIP
+ vo.setSuccessTime(TimeUtil.getGernalTime(userVIPInfo.getSuccessTime().getTime(), "yyyy.MM.dd"));
+ vo.setConserveMoney(finishMoney);
+ vo.setEarnMoney(rewardMoney);
+ } else {
+ BigDecimal rate = new BigDecimal("0.409");
+ vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney, rate));
+ vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardMoney, rate));
}
- data.put("earnMoney", earnMoney.setScale(2));
-
- // 娉細1.鏈夋晥涓�绾ч槦鍛樺畾涔夛細2019骞�1鏈�1鏃ヨ捣锛岃嚜璐垨鍒嗕韩1绗斾笖浠樻鎬婚噾棰濅笉灏忎簬1鍏冿紙閫�娆句负澶辨晥锛夛紱
- long teamNum = hongBaoV2CountService.countValidOrderTeamUserByUid(uid, "2019-01-01", new BigDecimal(1));
- data.put("teamNum", teamNum);
-
- // 绱閲戝竵
- BigDecimal goldCoin = integralDetailService.getCumulativeMoney(uid);
- data.put("goldCoin", goldCoin.setScale(0));
- // 甯姪閾炬帴
- data.put("helpLink", configService.get("help_link_vip_info"));
-
- // 浣跨敤绾㈠寘娆℃暟
+ vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
+
List<Integer> list = new ArrayList<Integer>();
list.add(BanLiShopOrder.STATE_SUCCESS);
- data.put("shopNum", banLiShopOrderService.countByUidAndState(uid, list));
- out.print(JsonUtil.loadTrueResult(data));
+ 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.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
+ 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())) {
+ vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));
+ } else {
+ vo.setLimitTeam(Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));
+ }
+ vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
+ vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
+ vo.setLimitgoldCoin(Long.parseLong(userVipConfigService.getValueByKey("require_gold_coin")));
+
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {
+ @Override
+ public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {
+ if (value == null) {
+ return new JsonPrimitive("");
+ } else {
+ // 淇濈暀2浣嶅皬鏁�
+ value = value.setScale(2);
+ return new JsonPrimitive(value.toString());
+ }
+ }
+ });
+ Gson gson = gsonBuilder.create();
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));
+ } else {
+ out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
+ }
}
+
+ /**
+ * 寮�閫歏IP
+ *
+ * @param callback
+ * @param acceptData
+ * @param uid
+ * @param out
+ */
+ @RequestMapping(value = "applyVip")
+ public void applyVip(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;
+ }
+
+ // 鐪侀挶 -鑷喘浜х敓杩斿埄
+
+ 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) {
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult(e.getMsg())));
+ } else {
+ out.print(JsonUtil.loadFalseResult(e.getMsg()));
+ }
+ return;
+ }
+
+ if (!StringUtil.isNullOrEmpty(callback)) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));
+ } else {
+ out.print(JsonUtil.loadTrueResult(""));
+ }
+ }
+
}
--
Gitblit v1.8.0