From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java | 130 ++++++++++++++++++++++++++++--------------
1 files changed, 86 insertions(+), 44 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 bf5bda6..17ddb7d 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,6 +1,7 @@
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;
@@ -16,14 +17,22 @@
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;
@@ -31,6 +40,7 @@
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;
@@ -38,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;
@@ -114,6 +125,9 @@
private DeviceTokenOPPOService deviceTokenOPPOService;
@Resource
+ private DeviceTokenXMService deviceTokenXMService;
+
+ @Resource
private DeviceTokenVIVOService deviceTokenVIVOService;
@Resource
@@ -176,6 +190,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
/**
* 鏂扮増鐧诲綍 V1.5.3
*
@@ -233,6 +250,7 @@
if (active != null) {
deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
+ deviceTokenXMService.bindUid(active.getId(), uuser.getId());
}
}
});
@@ -250,7 +268,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();
}
@@ -363,10 +381,7 @@
return;
}
//
- String inviteCode = "";
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode()))
- inviteCode = userInfoExtra.getInviteCode();
+ String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
UserVipRateVO vo = new UserVipRateVO();
vo.setId(uid);
@@ -374,14 +389,26 @@
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()));
- // 鐪侀挶 -鑷喘浜х敓杩斿埄
- BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
- // 鍒嗕韩璧�
- BigDecimal rewardShare = hongBaoV2CountService.getRewardMoneyByShare(uid);
- // 閭�璇疯禋
- BigDecimal rewardInvite = hongBaoV2CountService.getRewardMoneyByInvite(uid);
+ 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);
vo.setVipInfo(userVIPInfo);
@@ -405,19 +432,26 @@
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.setScale(2));
- vo.setEarnMoney(MoneyBigDecimalUtil.add(rewardShare, rewardInvite).setScale(2));
+ vo.setConserveMoney(finishMoney);
+ vo.setEarnMoney(rewardMoney);
} else {
- BigDecimal rate1 = new BigDecimal(5);
- BigDecimal rate2 = new BigDecimal(12);
- vo.setConserveMoney(
- MoneyBigDecimalUtil.mul2(finishMoney, MoneyBigDecimalUtil.div(rate1, rate2)).setScale(2));
- vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardShare, MoneyBigDecimalUtil.div(rate1, rate2)).setScale(2));
+ BigDecimal rate = new BigDecimal("0.409");
+ vo.setConserveMoney(MoneyBigDecimalUtil.mul2(finishMoney, rate));
+ vo.setEarnMoney(MoneyBigDecimalUtil.mul2(rewardMoney, rate));
}
+ vo.setFinishMoney(hongBaoV2CountService.getRewardMoneyBySelf(uid));
- vo.setFinishMoney(finishMoney.setScale(2));
+
+ 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.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
+
+
+ // 鍖哄垎鑰佺敤鎴峰拰鏂扮敤鎴�
String limtDate = userVipConfigService.getValueByKey("vip_execute_time");
Date executeDate = null;
try {
@@ -426,14 +460,6 @@
} catch (ParseException e) {
e.printStackTrace();
}
- List<Integer> list = new ArrayList<Integer>();
- list.add(BanLiShopOrder.STATE_SUCCESS);
- BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));
-
- vo.setFinishGoldCoin(integralDetailService.getCumulativeMoney(uid));
- vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid, executeDate.getTime(), payMoney));
- vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));
-
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null
&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
@@ -443,12 +469,27 @@
}
vo.setLimitHongBao(Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));
vo.setLimitMoney(new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));
- vo.setLimitgoldCoin(new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));
+ 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(vo)));
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(gson.toJson(vo))));
} else {
- out.print(JsonUtil.loadTrueResult(vo));
+ out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));
}
}
@@ -475,7 +516,18 @@
// 鐪侀挶 -鑷喘浜х敓杩斿埄
- // 浼氬憳瑙勫垯鎵ц鏃堕棿
+ 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 {
@@ -484,17 +536,7 @@
} catch (ParseException e) {
e.printStackTrace();
}
- 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, executeDate.getTime(), payMoney);
- long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);
- BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);
-
- long limitTeam = 0;
-
+
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null
&& (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {
--
Gitblit v1.8.0