From 0019bfde4bb8188bc7d8d9ae7878d117c7bd539c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 02 四月 2020 17:07:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 130 ------------------------------------------
1 files changed, 2 insertions(+), 128 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 7ca517a..794838e 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
@@ -27,7 +27,6 @@
import com.yeshi.fanli.entity.order.ESOrder;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
-import com.yeshi.fanli.entity.order.OrderTeamReward;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.log.LogHelper;
@@ -39,7 +38,6 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyServiceV2;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
-import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -88,9 +86,6 @@
@Resource
private ESOrderService esOrderService;
-
- @Resource
- private OrderTeamRewardService orderTeamRewardService;
@Resource
private UserVIPInfoService userVIPInfoService;
@@ -433,21 +428,6 @@
data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
// 鍥㈤槦濂栧姳 TODO
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- BigDecimal teamSubsidy = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, dateType, null);
- if (teamSubsidy == null) {
- teamSubsidy = new BigDecimal(0);
- }
-
- BigDecimal teamReward = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, dateType, null);
- if (teamReward == null) {
- teamReward = new BigDecimal(0);
- }
-
- data.put("teamSubsidy", teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("teamReward", teamReward.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("tutorSubsidy", "0.00");
- }
out.print(JsonUtil.loadTrueResult(data));
}
@@ -479,7 +459,7 @@
sumTeamSubsidy(out, user);
} else if (type == 2) {
// 濂栧姳
- sumTeamReward(out, user);
+ //TODO 鍥㈤槦濂栧姳宸茬粡鍒犻櫎
} else {
// 瀵煎笀娲ヨ创
JSONObject data = new JSONObject();
@@ -598,113 +578,7 @@
out.print(JsonUtil.loadTrueResult(data));
}
- /**
- * 缁熻鍥㈤槦濂栧姳
- * @param out
- * @param user
- */
- private void sumTeamReward(PrintWriter out, UserInfo user) {
- Long uid = user.getId();
- // 鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
-
- JSONObject data = new JSONObject();
- data.put("link", configService.get(ConfigKeyEnum.orderTeamRewardLink.getKey()));
- if (!vip) {
- data.put("exist", false);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
-
- data.put("exist", true);
- data.put("portrait", user.getPortrait());
-
- // 浠婃棩缁熻
- BigDecimal todayDirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 1, OrderTeamReward.LEVEL_ONE);
- if (todayDirect == null) {
- todayDirect = new BigDecimal(0);
- }
- BigDecimal todayIndirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 1, OrderTeamReward.LEVEL_TWO);
- if (todayIndirect == null) {
- todayIndirect = new BigDecimal(0);
- }
- TeamBonusVO today = new TeamBonusVO();
- today.setDirect(todayDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- today.setIndirect(todayIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- today.setTotal(
- MoneyBigDecimalUtil.add(todayDirect, todayIndirect).setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- // 鏄ㄦ棩缁熻
- BigDecimal yesterdayDirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 2,
- OrderTeamReward.LEVEL_ONE);
- if (yesterdayDirect == null) {
- yesterdayDirect = new BigDecimal(0);
- }
- BigDecimal yesterdayIndirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 2,
- OrderTeamReward.LEVEL_TWO);
- if (yesterdayIndirect == null) {
- yesterdayIndirect = new BigDecimal(0);
- }
- TeamBonusVO yesterday = new TeamBonusVO();
- yesterday.setDirect(yesterdayDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- yesterday.setIndirect(yesterdayIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- yesterday.setTotal(MoneyBigDecimalUtil.add(yesterdayDirect, yesterdayIndirect)
- .setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- // 鏈湀缁熻
- BigDecimal thisMonthDirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 3,
- OrderTeamReward.LEVEL_ONE);
- if (thisMonthDirect == null) {
- thisMonthDirect = new BigDecimal(0);
- }
- BigDecimal thisMonthIndirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 3,
- OrderTeamReward.LEVEL_TWO);
- if (thisMonthIndirect == null) {
- thisMonthIndirect = new BigDecimal(0);
- }
- TeamBonusVO thisMonth = new TeamBonusVO();
- thisMonth.setDirect(thisMonthDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- thisMonth.setIndirect(thisMonthIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- thisMonth.setTotal(MoneyBigDecimalUtil.add(thisMonthDirect, thisMonthIndirect)
- .setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- // 鏈湀缁熻
- BigDecimal lastMonthDirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 4,
- OrderTeamReward.LEVEL_ONE);
- if (lastMonthDirect == null) {
- lastMonthDirect = new BigDecimal(0);
- }
- BigDecimal lastMonthIndirect = orderTeamRewardService.sumValidMoneyByUidAndDate(uid, 4,
- OrderTeamReward.LEVEL_TWO);
- if (lastMonthIndirect == null) {
- lastMonthIndirect = new BigDecimal(0);
- }
- TeamBonusVO lastMonth = new TeamBonusVO();
- lastMonth.setDirect(lastMonthDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- lastMonth.setIndirect(lastMonthIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- lastMonth.setTotal(MoneyBigDecimalUtil.add(lastMonthDirect, lastMonthIndirect)
- .setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- BigDecimal direct = orderTeamRewardService.sumRecievedMoneyByUid(uid, OrderTeamReward.LEVEL_ONE);
- if (direct == null) {
- direct = new BigDecimal(0);
- }
- BigDecimal indirect = orderTeamRewardService.sumRecievedMoneyByUid(uid, OrderTeamReward.LEVEL_TWO);
- if (indirect == null) {
- indirect = new BigDecimal(0);
- }
- BigDecimal total = MoneyBigDecimalUtil.add(direct, indirect);
-
- data.put("today", today);
- data.put("yesterday", yesterday);
- data.put("thisMonth", thisMonth);
- data.put("lastMonth", lastMonth);
- data.put("total", total.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("direct", direct.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("indirect", indirect.setScale(2, BigDecimal.ROUND_DOWN).toString());
- out.print(JsonUtil.loadTrueResult(data));
- }
-
+
/**
* 杩斿埄璇存槑
* @param acceptData
--
Gitblit v1.8.0