From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 728 +++++++++++++++++++++++++++++--------------------------
1 files changed, 378 insertions(+), 350 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 bf188f5..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
@@ -5,7 +5,9 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Resource;
@@ -16,24 +18,42 @@
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;
+import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.ESOrder;
-import com.yeshi.fanli.entity.order.InviteOrderSubsidy;
-import com.yeshi.fanli.entity.order.OrderTeamReward;
+import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
+import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
+import com.yeshi.fanli.service.inter.order.CommonOrderGoodsService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.ESOrderService;
-import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyServiceV2;
-import com.yeshi.fanli.service.inter.order.OrderTeamRewardService;
+import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
+import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
+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;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
+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.vip.UserVIPInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
@@ -41,11 +61,13 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
+import com.yeshi.fanli.util.user.UserLevelUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.order.GoodsRebateVO;
+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.order.TeamBonusVO;
+import com.yeshi.fanli.vo.user.MineInfoVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -72,22 +94,50 @@
@Resource
private RedisManager redisManager;
-
+
@Resource
private UserCustomSettingsService userCustomSettingsService;
-
+
@Resource
private ESOrderService esOrderService;
@Resource
- private OrderTeamRewardService orderTeamRewardService;
-
- @Resource
private UserVIPInfoService userVIPInfoService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
@Resource
- private InviteOrderSubsidyServiceV2 inviteOrderSubsidyServiceV2;
+ private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private OrderHongBaoMoneyComputeService orderHongBaoMoneyComputeService;
+
+ @Resource
+ private CommonOrderGoodsService commonOrderGoodsService;
+ @Resource
+ private TaoBaoWeiQuanOrderService taoBaoWeiQuanOrderService;
+
+ @Resource
+ private JumpDetailV2Service jumpDetailV2Service;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
+
+ @Resource
+ private UserInviteService userInviteService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private OrderHongBaoMapService orderHongBaoMapService;
+
+ @Resource
+ private PreviewInfoService previewInfoService;
+
+
/**
* 璁㈠崟鍒楄〃
*
@@ -115,23 +165,24 @@
* @param out
*/
@RequestMapping(value = "getOrderList", method = RequestMethod.POST)
- public void getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, String type,
- Integer orderState, String orderNo, String startTime, String endTime, Integer slotTime,
- Integer dateType, Integer goodsType, String source, PrintWriter out) {
+ public void getOrderList(AcceptData acceptData, Integer page, Long uid, Integer state, String type,
+ Integer orderState, String orderNo, String startTime, String endTime, Integer slotTime, Integer dateType,
+ Integer goodsType, String source, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
if (page == null || page < 1)
page = 1;
-
+
// 鎼滅储鍐呭銆佽鍗曞彿
- if (!StringUtil.isNullOrEmpty(orderNo) && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (!StringUtil.isNullOrEmpty(orderNo)
+ && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
searchOrder(acceptData, orderNo, page, uid, out);
return;
}
-
+
// 杞崲鐘舵��
if (state != null) {
if (state == 0) {
@@ -152,18 +203,18 @@
Integer orderType = null;
if (StringUtil.isNullOrEmpty(type)) {
orderType = null;
- } else if (!"0".equalsIgnoreCase(type)){
- orderType = Integer.parseInt(type);
- }
+ } else if (!"0".equalsIgnoreCase(type)) {
+ orderType = Integer.parseInt(type);
+ }
if (goodsType != null && goodsType == 0)
goodsType = null;
-
+
// 绛涢�夋椂闂�
if (slotTime != null) {
try {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
-
+
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
endTime = sd.format(new Date());
@@ -193,7 +244,7 @@
e.printStackTrace();
}
}
-
+
if (endTime != null && endTime.trim().length() > 0) {
endTime += " 23:59:59";
}
@@ -201,8 +252,8 @@
List<Integer> listSource = new ArrayList<>();
if (goodsType != null) {
listSource.add(goodsType);
- }
-
+ }
+
try {
// 绛涢�夌粨鏋滈《閮ㄧ粺璁�
String validMoney = "0.00";
@@ -210,14 +261,14 @@
if (page == 1) {
BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
orderNo, state, startTime, endTime, listSource);
- if (predictMoney != null)
+ if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
-
+
BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
orderNo, state, startTime, endTime, listSource);
- if (postSaleMoney != null)
+ if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
-
+
if (orderType != null && dateType != null && dateType == 4) {
if (orderType == 1) {
dateType = 6; // 杩斿埄璁㈠崟鏈夋晥
@@ -226,27 +277,34 @@
}
}
}
-
- // 鏌ヨ鍒楄〃
- List<CommonOrderVO> list = commonOrderService.getOrderByUid(acceptData, page, uid, state, orderType, orderState,
- orderNo, startTime, endTime, dateType, listSource);
- // 缁熻鎬绘暟
- long count = commonOrderService.countGroupOrderNoByUid(uid, state, orderType, orderState, orderNo, startTime,
- endTime, dateType, listSource);
+
+
+ long count = 0L;
+ List<CommonOrderVO> list = null;
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
+ list = commonOrderService.getOrderList(acceptData, page, uid, state, orderType,
+ orderState, orderNo, startTime, endTime, dateType, listSource);
+ count = commonOrderService.countOrderList(uid, state, orderType, orderState, orderNo,
+ startTime, endTime, dateType, listSource);
+ } else {
+ list = commonOrderService.getOrderByUid(acceptData, page, uid, state, orderType,
+ orderState, orderNo, startTime, endTime, dateType, listSource);
+ count = commonOrderService.countGroupOrderNoByUid(uid, state, orderType, orderState, orderNo,
+ startTime, endTime, dateType, listSource);
+ }
- // 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀� 8绉掑唴璇锋眰3娆¤Е鍙�
+ // 鍒ゆ柇鏄惁闇�瑕佹樉绀鸿鍗曟壘鍥炴彁绀� 8绉掑唴璇锋眰3娆¤Е鍙�
String orderFindUrl = null;
- if (state ==null && page == 1) {
- if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4)||count==0L) {
+ if (state == null && page == 1) {
+ if (redisManager.frequencyLimit("orderlist-" + acceptData.getDevice(), 8, 4) || count == 0L) {
orderFindUrl = configService.get(ConfigKeyEnum.orderFindNotifyUrl.getKey());
}
}
-
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));
- data.put("bonusLink", configService.get(ConfigKeyEnum.orderBonusLink.getKey()));
data.put("validMoney", "楼 " + validMoney);
data.put("invalidMoney", "楼 " + invalidMoney);
data.put("findOrderHelpUrl", orderFindUrl);
@@ -258,7 +316,7 @@
LogHelper.errorDetailInfo(e);
}
}
-
+
/**
* 鎼滅储璁㈠崟
* @param key
@@ -269,9 +327,10 @@
long count = 0;
List<CommonOrderVO> list = null;
if (NumberUtil.isNumeric(key.replace("-", ""))) {
- list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, null);
- }
-
+ list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null,
+ null);
+ }
+
if (list == null || list.size() == 0) {
List<ESOrder> listES = esOrderService.query(key, uid.toString(), null);
if (listES.size() != 0) {
@@ -281,11 +340,11 @@
} else {
count = list.size();
}
-
+
if (list == null) {
list = new ArrayList<>();
}
-
+
JSONObject data = new JSONObject();
data.put("count", count);
data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
@@ -297,7 +356,6 @@
}
}
-
/**
* 鐢ㄦ埛璁㈠崟缁熻
*
@@ -313,7 +371,7 @@
out.print(JsonUtil.loadFalseResult(1, "璇锋眰鍙傛暟涓嶆纭�"));
return;
}
-
+
try {
UserInfo user = userInfoService.selectByPKey(uid);
if (user == null) {
@@ -329,7 +387,7 @@
}
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
-
+
List<Integer> listSource = new ArrayList<>();
if (type == null || type == 0) {
OrderCountVO total = commonOrderService.getOrderCount(uid, null, null);
@@ -342,10 +400,10 @@
data.put("self", 0);
data.put("shared", 0);
data.put("invite", 0);
-
+
listSource.add(type);
}
-
+
// 浠婂ぉ
OrderCountVO today = commonOrderService.getOrderCount(uid, 1, listSource);
today.setTotal(today.getSelf() + today.getShared() + today.getInvite());
@@ -370,7 +428,6 @@
}
}
-
/**
* 缁熻濂栭噾
* @param acceptData
@@ -384,296 +441,59 @@
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
boolean show = false;
UserSettingsVO settings = null;
try {
settings = userCustomSettingsService.getMySettings(uid);
} catch (Exception e) {
}
-
+
// 楠岃瘉鏄惁鏄剧ず妯″潡
- if (settings != null && settings.getNoBonusCount()!= null) {
- if(settings.getNoBonusCount() == 1) {
+ if (settings != null && settings.getNoBonusCount() != null) {
+ if (settings.getNoBonusCount() == 1) {
show = false;
- } else if(settings.getNoBonusCount() == 0) {
+ } else if (settings.getNoBonusCount() == 0) {
show = true;
}
} else {
show = hongBaoV2CountService.getHongBaoCount(uid, null) > 0;
}
+
+ 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());
+ }
+ }
+ }
- BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 1, null);
- BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 2, null);
- BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
+ 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("selfMoney", selfMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
data.put("shareMoney", shareMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
- 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");
- }
+ data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
out.print(JsonUtil.loadTrueResult(data));
}
-
- /**
- * 鍥㈤槦鏀剁泭缁熻 缁熻宸插埌璐︽湭鍒拌处 锛� 绱鍙粺璁″凡鍒拌处
- * @param acceptData
- * @param uid
- * @param type 1-鍥㈤槦琛ヨ创 2-鍥㈤槦濂栧姳 3-瀵煎笀娲ヨ创
- */
- @RequestMapping(value = "getTeamBonus", method = RequestMethod.POST)
- public void getTeamBonus(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- UserInfo user = userInfoService.selectByPKey(uid);
- if (user == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛涓嶅瓨鍦�"));
- return;
- }
-
- if (type == null || type < 1 || type > 3) {
- type = 1;
- }
-
- if (type == 1) {
- // 琛ヨ创
- sumTeamSubsidy(out, user);
- } else if (type == 2) {
- // 濂栧姳
- sumTeamReward(out, user);
- } else {
- // 瀵煎笀娲ヨ创
- JSONObject data = new JSONObject();
- data.put("exist", false);
- data.put("link", configService.get(ConfigKeyEnum.tutorSubsidyLink.getKey()));
- out.print(JsonUtil.loadTrueResult(data));
- }
- }
-
- /**
- * 缁熻琛ヨ创
- * @param out
- * @param user
- */
- private void sumTeamSubsidy(PrintWriter out, UserInfo user) {
- Long uid = user.getId();
- // 鏄惁VIP
- boolean vip = userVIPInfoService.isVIP(uid);
-
- JSONObject data = new JSONObject();
- data.put("link", configService.get(ConfigKeyEnum.orderTeamSubsidyLink.getKey()));
- if (!vip) {
- data.put("exist", false);
- out.print(JsonUtil.loadTrueResult(data));
- return;
- }
-
- data.put("exist", true);
- data.put("portrait", user.getPortrait());
-
- // 浠婃棩缁熻
- BigDecimal todayDirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 1, InviteOrderSubsidy.LEVEL_ONE);
- if (todayDirect == null) {
- todayDirect = new BigDecimal(0);
- }
- BigDecimal todayIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 1, InviteOrderSubsidy.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 = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 2, InviteOrderSubsidy.LEVEL_ONE);
- if (yesterdayDirect == null) {
- yesterdayDirect = new BigDecimal(0);
- }
- BigDecimal yesterdayIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 2, InviteOrderSubsidy.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 = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 3, InviteOrderSubsidy.LEVEL_ONE);
- if (thisMonthDirect == null) {
- thisMonthDirect = new BigDecimal(0);
- }
- BigDecimal thisMonthIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 3, InviteOrderSubsidy.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 = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 4, InviteOrderSubsidy.LEVEL_ONE);
- if (lastMonthDirect == null) {
- lastMonthDirect = new BigDecimal(0);
- }
- BigDecimal lastMonthIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 4, InviteOrderSubsidy.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 = inviteOrderSubsidyServiceV2.sumRecievedMoneyByUid(uid, InviteOrderSubsidy.LEVEL_ONE);
- if (direct == null) {
- direct = new BigDecimal(0);
- }
- BigDecimal indirect = inviteOrderSubsidyServiceV2.sumRecievedMoneyByUid(uid, InviteOrderSubsidy.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 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));
- }
-
/**
* 杩斿埄璇存槑
@@ -684,51 +504,259 @@
* @param out
*/
@RequestMapping(value = "getReBateInfo")
- public void getReBateInfo(String callback, AcceptData acceptData, Long uid, String orderNo, Integer sourceType, PrintWriter out) {
+ public void getReBateInfo(String callback, AcceptData acceptData, Long uid, String orderNo, Integer sourceType,
+ PrintWriter out) {
if (uid == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛鏈櫥褰�"));
return;
}
-
+
UserInfo user = userInfoService.selectByPKey(uid);
if (user == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
return;
}
+
+ // 绾㈠寘淇℃伅
+ List<HongBaoOrder> hoList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType, uid);
+ HongBaoCountVO hongBaoCountVO = hongBaoOrderService.getHongBaoCountVO(hoList);
- GoodsRebateVO goodsVO = new GoodsRebateVO();
- goodsVO.setTitle("鑸掑鑸掑厠鍏夋劅鐐櫧鐗欑墖缇庣櫧鐗欓娇鐗欒啘濂楄鍘婚粍鐗欐竻鏂板彛姘�");
- goodsVO.setPicture("https://img.alicdn.com/bao/uploaded/i4/355739614/O1CN01RB6Hlg2KtGMWR4mON_!!0-item_pic.jpg");
- goodsVO.setActualPay("楼60.00");
- goodsVO.setFanliRate("X20%");
- goodsVO.setFanliExpect("楼25.00");
- goodsVO.setCommision("10.00");
- goodsVO.setSubsidy("6.00");
+ Integer hongBaoState = hongBaoCountVO.getCurrentState();
+ String stateDesc = "";
+ String predictDesc = "";
+ if (HongBaoV2.STATE_KELINGQU == hongBaoState || HongBaoV2.STATE_BUKELINGQU == hongBaoState) {
+ stateDesc = "鏈埌璐�";
+ predictDesc = "棰勪及";
+ } else if (HongBaoV2.STATE_YILINGQU == hongBaoState) {
+ stateDesc = "宸插埌璐�";
+ } else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
+ stateDesc = "宸插け鏁�";
+ }
- GoodsRebateVO goodsVO2 = new GoodsRebateVO();
- goodsVO2.setTitle("棣ヤ僵缇庣櫧鏌旇偆姘寸埥鑲ゆ按琛ユ按淇濇箍濂冲寲濡嗘箍鏁风簿鍗庢按鐢锋棗鑸板簵瀹樼綉姝ｅ搧");
- goodsVO2.setPicture("https://img.alicdn.com/bao/uploaded/i4/738252756/O1CN01MgFdXy1WEI8zmkyg7_!!0-item_pic.jpg");
- goodsVO2.setActualPay("楼62.00");
- goodsVO2.setFanliRate("X22%");
- goodsVO2.setFanliExpect("楼26.00");
- goodsVO2.setCommision("12.00");
- goodsVO2.setSubsidy("8.00");
+ int type = 0;
+ String typeName = "";
+ int hongBaoType = hoList.get(0).getHongBaoV2().getType();
+ if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
+ type = 1;
+ typeName = "杩斿埄";
+ } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
+ type = 2;
+ typeName = "濂栭噾";
+ } else if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType
+ || HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
+ || HongBaoV2.TYPE_ERJI == hongBaoType) {
+ type = 3;
+ typeName = "鏀剁泭";
+ }
- List<GoodsRebateVO> listGoods= new ArrayList<>();
- listGoods.add(goodsVO);
- listGoods.add(goodsVO2);
+ List<Long> goodsIdList = new ArrayList<>();
+ if (hoList != null)
+ for (HongBaoOrder hongBaoOrder : hoList) {
+ if (hongBaoOrder.getCommonOrder() != null)
+ goodsIdList.add(hongBaoOrder.getCommonOrder().getCommonOrderGoods().getId());
+ }
+
+ Map<Long, CommonOrderGoods> orderGoodsMap = new HashMap<>();
+ List<CommonOrderGoods> goodsList = commonOrderGoodsService.listByByPrimaryKeys(goodsIdList);
+ if (goodsList != null)
+ for (CommonOrderGoods goods : goodsList)
+ orderGoodsMap.put(goods.getId(), goods);
+
OrderRebateVO orderRebateVO = new OrderRebateVO();
- orderRebateVO.setTotalFanLi("楼50.00");
- orderRebateVO.setUpperFanLi("楼60.00");
- orderRebateVO.setUserLevel(UserLevelEnum.daRen.name());
- orderRebateVO.setJumpLink("https://www.baidu.com/");
- orderRebateVO.setListGoods(listGoods);
+ // 绾㈠寘淇℃伅
+ BigDecimal hongBao = hongBaoCountVO.getValidMoney();
+ if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
+ List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderNo);
+ if (listWQ != null && listWQ.size() > 0) {
+ BigDecimal weiQuanMoney = commonOrderService.getWeiQuanMoney(listWQ, sourceType, uid);
+
+ orderRebateVO.setWq(true);
+ orderRebateVO.setWqMoney("楼"+ weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ if (hongBao.compareTo(weiQuanMoney) > 0) {
+ orderRebateVO.setWqDesc("閮ㄥ垎鍞悗閫�鍥�");
+ } else {
+ orderRebateVO.setWqDesc("鍞悗閫�鍥�");
+ }
+ // 璁＄畻鍓╀綑绾㈠寘
+ hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
+ }
+ }
+
+ // 绾㈠寘鑾峰緱鑰�
+ HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();
+ UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());
+ if (userLevel == null)
+ userLevel = UserLevelEnum.daRen;
+ UserLevelEnum upperLevel = UserLevelEnum.superVIP;
+
+ // 璁㈠崟璐拱鑰�
+ CommonOrder commonOrder1 = hoList.get(0).getCommonOrder();
+ Date downTime = commonOrder1.getThirdCreateTime();
+ UserLevelEnum buyer = UserLevelUtil.getByOrderRank(commonOrder1.getUrank());
+ if (buyer == null) {
+ buyer = UserLevelEnum.daRen;
+ }
+
+ BigDecimal upperTotalMoney = new BigDecimal(0);
+ List<GoodsRebateVO> voList = new ArrayList<>();
+ for (HongBaoOrder hongBaoOrder : hoList) {
+ if (hongBaoOrder.getHongBaoV2().getState() == HongBaoV2.STATE_SHIXIAO)
+ hongBaoOrder.getHongBaoV2().setMoney(new BigDecimal(0));
+
+ GoodsRebateVO goodsVO = new GoodsRebateVO();
+
+ // 鏍囬銆佸浘鐗�
+ CommonOrder commonOrder = hongBaoOrder.getCommonOrder();
+ if (orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()) != null) {
+ goodsVO.setTitle(orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()).getTitle());
+ goodsVO.setPicture(orderGoodsMap.get(commonOrder.getCommonOrderGoods().getId()).getPicture());
+ }
+
+ // 瀹炰粯娆�
+ BigDecimal payment = hongBaoOrder.getCommonOrder().getPayment();
+ // 鑻ュ凡缁撶畻 -鏄剧ず缁撶畻閲戦
+ Integer orderState = hongBaoOrder.getCommonOrder().getState();
+ if (hongBaoOrder.getCommonOrder().getSettlement() != null
+ && (orderState == CommonOrder.STATE_JS || orderState == CommonOrder.STATE_WQ))
+ payment = hongBaoOrder.getCommonOrder().getSettlement();
+ if (payment == null)
+ payment = new BigDecimal(0);
+ goodsVO.setActualPay("楼" + payment.setScale(2, BigDecimal.ROUND_DOWN));
+
+ BigDecimal fanli = hongBaoOrder.getHongBaoV2().getMoney();
+ // 鍩虹浣ｉ噾
+ BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
+ goodsVO.setCommision("楼" +commission.setScale(2, BigDecimal.ROUND_DOWN));
+
+ // 骞冲彴琛ヨ创 = 杩斿埄 - 鍩虹浣ｉ噾
+ goodsVO.setSubsidy("楼" + fanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));
+ // 杈句汉琛ヨ创
+ if (userLevel != UserLevelEnum.daRen) {
+ BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);
+ goodsVO.setOriginSubsidy("楼" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");
+ }
+
+ if (type == 3) { // 濂栭噾
+ goodsVO.setBonus("楼" + fanli.setScale(2, BigDecimal.ROUND_DOWN) +"");
+ }
+
+ voList.add(goodsVO);
+
+ if (type == 1 ) {
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
+ } else if (type == 2) {
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));
+ } else if (type == 3) {
+ List<UserTeamLevel> bossLevelList = new ArrayList<>();
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
+ bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFirstInviteMoney(commonOrder,
+ buyer, bossLevelList));
+ } else {
+ Integer bRank = hongBaoV2Service.getDirectBossUrankByPid(hongBaoOrder.getHongBaoV2().getParent().getId());
+ UserLevelEnum directBoss = UserLevelUtil.getByOrderRank(bRank);
+ if (directBoss == null) {
+ directBoss = UserLevelEnum.daRen;
+ }
+ bossLevelList.add(new UserTeamLevel(null, directBoss));
+ bossLevelList.add(new UserTeamLevel(null, UserLevelEnum.superVIP));
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeSecondInviteMoney(commonOrder,
+ buyer, bossLevelList));
+ }
+ }
+ }
+
+
+ orderRebateVO.setFanLiDesc(predictDesc + typeName);
+ orderRebateVO.setFanLi("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN));
+ orderRebateVO.setType(type);
+ orderRebateVO.setStateDesc(stateDesc);
+ orderRebateVO.setListGoods(voList);
+ if (downTime.getTime() < Constant.NEW_ORDER_FANLI_RULE_TIME) {
+ orderRebateVO.setUserLevel(UserLevelEnum.superVIP.name()); // 闅愯棌
+ } else {
+ orderRebateVO.setUserLevel(userLevel.name());
+ }
+
+ // 瓒呯骇浼氬憳杩斿埄
+ if (upperLevel != null) {
+ orderRebateVO.setUpperFanLi("楼" + upperTotalMoney);
+ orderRebateVO.setJumpLink(upperLevel.getDetailLink());
+ }
+
+ int freeState = 0;
+ boolean rewardSuccess = false;
+ List<String> listNo = new ArrayList<String>();
+ listNo.add(orderNo);
+ List<UserSystemCouponRecord> useRecord = userSystemCouponRecordService.getRecordByOrderNoList(sourceType, listNo);
+ if (useRecord != null && useRecord.size() > 0) {
+ for (UserSystemCouponRecord couponRecord : useRecord) {
+ Integer state = couponRecord.getState();
+ String cType = couponRecord.getCouponType();
+ if (CouponTypeEnum.rebatePercentCoupon.name().equals(cType) && UserSystemCouponRecord.STATE_SUCCESS == state) {
+ rewardSuccess = true;
+ break;
+ } else if (CouponTypeEnum.freeCoupon.name().equals(cType) || CouponTypeEnum.welfareFreeCoupon.name().equals(cType)
+ || CouponTypeEnum.freeCouponBuy.name().equals(cType)) {
+ freeState = state;
+ break;
+ }
+ }
+ }
+
+ if (rewardSuccess) { // 宸蹭娇鐢ㄥ鍔卞埜
+ JSONObject params = new JSONObject();
+ params.put("orderNo", orderNo);
+ params.put("goodsType", sourceType + "");
+ BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
+ if (couponMoney == null) {
+ couponMoney = new BigDecimal(0);
+ }
+ orderRebateVO.setCouponType(1);
+ orderRebateVO.setCouponUse(true);
+ orderRebateVO.setCouponText("濂栧姳鎴愬姛");
+ orderRebateVO.setCouponDesc("宸插啀杩斅�" +couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ orderRebateVO.setCouponParams(params.toString());
+ orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
+ } else if (freeState > 0) { // 宸蹭娇鐢ㄥ厤鍗曞埜
+ JSONObject params = new JSONObject();
+ params.put("orderNo", orderNo);
+ params.put("goodsType", sourceType + "");
+ orderRebateVO.setCouponType(2);
+ orderRebateVO.setCouponUse(true);
+ orderRebateVO.setCouponParams(params.toString());
+ orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
+ if (UserSystemCouponRecord.STATE_FREE_ON == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟涓�");
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟鎴愬姛");
+ } else if (UserSystemCouponRecord.STATE_FAIL_RULE == freeState
+ || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == freeState) {
+ orderRebateVO.setCouponText("鍏嶅崟澶辫触");
+ }
+ } else {
+ Date accountTime = hongBaoV2.getGetTime();
+ // 鍒拌处鏃堕棿 -绾㈠寘閲戦闄愬埗
+ if (accountTime != null && hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) <= 0) {
+ boolean vip = userInviteService.verifyVIP(uid);
+ Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
+ long currentTime = java.lang.System.currentTimeMillis();
+ if (endDay.getTime() > currentTime && !vip) {
+ UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ if (couponRecord == null) {
+ orderRebateVO.setCoupon(true);
+ orderRebateVO.setCouponType(1);
+ orderRebateVO.setCouponText("绔嬪嵆浣跨敤");
+ orderRebateVO.setCouponDesc("杩斿埄鍐嶈繑");
+ }
+ }
+ }
+ }
JSONObject data = new JSONObject();
data.put("result", orderRebateVO);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
}
--
Gitblit v1.8.0