From 48b511dbf38054a4d6bc4383681ce50fd11df378 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 14 五月 2020 21:48:20 +0800
Subject: [PATCH] VIP数据预览
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
index c0061fb..e162767 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java
@@ -18,9 +18,12 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
+import com.google.gson.Gson;
import com.yeshi.fanli.dto.order.UserTeamLevel;
+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.PreviewInfo.PreviewEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
@@ -44,6 +47,7 @@
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;
+import com.yeshi.fanli.service.inter.user.PreviewInfoService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -63,6 +67,7 @@
import com.yeshi.fanli.vo.order.HongBaoCountVO;
import com.yeshi.fanli.vo.order.OrderCountVO;
import com.yeshi.fanli.vo.order.OrderRebateVO;
+import com.yeshi.fanli.vo.user.MineInfoVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -128,6 +133,10 @@
@Resource
private OrderHongBaoMapService orderHongBaoMapService;
+
+ @Resource
+ private PreviewInfoService previewInfoService;
+
/**
* 璁㈠崟鍒楄〃
@@ -451,17 +460,36 @@
show = hongBaoV2CountService.getHongBaoCount(uid, null) > 0;
}
- BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1, null);
- BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);
+ BigDecimal selfMoney = null;
+ BigDecimal shareMoney = null;
+ BigDecimal teamMoney = null;
+ // VIP棰勮淇℃伅
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.mineInfo);
+ if (!StringUtil.isNullOrEmpty(redisContent)) {
+ MineInfoVO vo = new Gson().fromJson(redisContent, MineInfoVO.class);
+ if (vo != null) {
+ if (!StringUtil.isNullOrEmpty(vo.getSelfRebate()))
+ selfMoney = new BigDecimal(vo.getSelfRebate());
+ if (!StringUtil.isNullOrEmpty(vo.getShareBonus()))
+ shareMoney = new BigDecimal(vo.getShareBonus());
+ if (!StringUtil.isNullOrEmpty(vo.getTeamBonus()))
+ teamMoney = new BigDecimal(vo.getTeamBonus());
+ }
+ }
+ }
+
+ if (selfMoney == null) {
+ selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1, null);
+ shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);
+ teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
+ }
+
JSONObject data = new JSONObject();
data.put("show", show);
data.put("selfMoney", selfMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- BigDecimal teamMoney = new BigDecimal(0);
- teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
-
data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
out.print(JsonUtil.loadTrueResult(data));
}
--
Gitblit v1.8.0