From c6b718c3cadf5e5fff4c2a47fd1247842439f8c7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期三, 15 四月 2020 10:45:18 +0800
Subject: [PATCH] 团队消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 346 ++++++++++++++++++++------------------------------------
1 files changed, 125 insertions(+), 221 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 03cbab1..5f42f04 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
@@ -20,7 +20,6 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
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;
@@ -42,6 +41,7 @@
import com.yeshi.fanli.service.inter.order.ESOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;
+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.UserCustomSettingsService;
@@ -64,7 +64,6 @@
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.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -127,6 +126,9 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private OrderHongBaoMapService orderHongBaoMapService;
/**
* 璁㈠崟鍒楄〃
@@ -295,7 +297,6 @@
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);
@@ -479,173 +480,8 @@
dividend = new BigDecimal(0);
// 鎬诲洟闃熷鍔�
teamMoney = bonus.add(subsidy).add(dividend);
-
- JSONObject paramsFanli = new JSONObject();
- paramsFanli.put("type", "1");
- data.put("paramsFanli", paramsFanli);
- data.put("jumpFanli", jumpDetailV2Service.getByTypeCache("fanli_share_statistics",
- Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
-
- JSONObject paramsShare = new JSONObject();
- paramsShare.put("type", "2");
- data.put("paramsShare", paramsShare);
- data.put("jumpShare", jumpDetailV2Service.getByTypeCache("fanli_share_statistics",
- Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
-
- JSONObject paramsTeam = new JSONObject();
- paramsTeam.put("type", "3");
- data.put("paramsTeam", paramsTeam);
- data.put("jumpTeam", jumpDetailV2Service.getByTypeCache("team_statistics",
- Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())));
}
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) {
- // 濂栧姳
- //TODO 鍥㈤槦濂栧姳宸茬粡鍒犻櫎
- } 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));
}
@@ -727,7 +563,7 @@
BigDecimal weiQuanMoney = commonOrderService.getWeiQuanMoney(listWQ, sourceType, uid);
orderRebateVO.setWq(true);
- orderRebateVO.setWqMoney("-楼"+ weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ orderRebateVO.setWqMoney("楼"+ weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));
if (hongBao.compareTo(weiQuanMoney) > 0) {
orderRebateVO.setWqDesc("閮ㄥ垎鍞悗閫�鍥�");
} else {
@@ -737,15 +573,14 @@
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
}
}
- orderRebateVO.setFanLiDesc(predictDesc + typeName);
- orderRebateVO.setFanLi("楼" + hongBao.setScale(2));
+
HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();
UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());
if (userLevel == null)
userLevel = UserLevelEnum.daRen;
UserLevelEnum upperLevel = UserLevelEnum.superVIP;
-
+
BigDecimal upperTotalMoney = new BigDecimal(0);
List<GoodsRebateVO> voList = new ArrayList<>();
for (HongBaoOrder hongBaoOrder : hoList) {
@@ -767,30 +602,36 @@
payment = hongBaoOrder.getCommonOrder().getSettlement();
if (payment == null)
payment = new BigDecimal(0);
- goodsVO.setActualPay("楼" + payment.setScale(2));
-
+ goodsVO.setActualPay("楼" + payment.setScale(2, BigDecimal.ROUND_DOWN));
+ BigDecimal fanli = hongBaoOrder.getHongBaoV2().getMoney();
+ // 鍩虹浣ｉ噾
BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);
- if (type == 3) { // 濂栭噾
- goodsVO.setBonus("楼" + hongBaoOrder.getHongBaoV2().getMoney() +"");
- } else { // 浣ｉ噾
- goodsVO.setCommision("楼" +commission);
- }
-
- // 骞冲彴琛ヨ创
- BigDecimal vipFanli = hongBaoOrder.getHongBaoV2().getMoney();
- goodsVO.setSubsidy(vipFanli.subtract(commission).setScale(2) + "");
+ 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) + "");
+ goodsVO.setOriginSubsidy("楼" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");
+ }
+
+ if (type == 3) { // 濂栭噾
+ goodsVO.setBonus("楼" + fanli.setScale(2, BigDecimal.ROUND_DOWN) +"");
}
voList.add(goodsVO);
-
- upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
+
+ if (type == 1 ) {
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));
+ } else if (type == 2) {
+ upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));
+ }
}
+ CommonOrder commonOrder = hoList.get(0).getCommonOrder();
+ Date downTime = commonOrder.getThirdCreateTime();
+
// 鍥㈤槦琛ヨ创
if (type == 3) {
BigDecimal teamSubsidy = null;
@@ -798,16 +639,27 @@
InviteOrderSubsidy inviteOrderSubsidy = inviteOrderSubsidyServiceV2.getByOrderNoAndType(uid, orderNo, sourceType);
if (inviteOrderSubsidy != null) {
teamSubsidy = inviteOrderSubsidy.getMoney();
+ Integer urank = commonOrder.getUrank();
+ UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
+ boolean direct = false;
+ if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
+ direct = true;
+ }
+
+ BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,buyerUserLevel, userLevel, direct);
+
+ // 璁＄畻杈句汉琛ヨ创
if (userLevel != UserLevelEnum.daRen) {
- CommonOrder commonOrder = hoList.get(0).getCommonOrder();
- Integer urank = commonOrder.getUrank();
- UserLevelEnum buyerUserLevel = UserLevelUtil.getByOrderRank(urank);
- boolean direct = false;
- if (hongBaoV2.getType() == HongBaoV2.TYPE_YIJI || hongBaoV2.getType() == HongBaoV2.TYPE_SHARE_YIJI) {
- direct = true;
- }
- // 璁＄畻涓婁竴绾цˉ璐�
- lowerSubsidy = getLowerSubsidy(inviteOrderSubsidy.getMoney(), commonOrder.getThirdCreateTime(), buyerUserLevel, userLevel, direct);
+ BigDecimal daRenRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel,
+ UserLevelEnum.daRen, direct);
+ lowerSubsidy = MoneyBigDecimalUtil.div(teamSubsidy.multiply(daRenRate), originRate);
+ }
+
+ if (userLevel != UserLevelEnum.superVIP && userLevel != UserLevelEnum.superVIP) {
+ BigDecimal vipRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel,
+ UserLevelEnum.superVIP, direct);
+ upperTotalMoney = upperTotalMoney.add(MoneyBigDecimalUtil.div(teamSubsidy.multiply(vipRate), originRate));
+ System.out.println(upperTotalMoney);
}
} else {
teamSubsidy = BigDecimal.valueOf(0.00);
@@ -815,34 +667,98 @@
}
if (userLevel != UserLevelEnum.daRen) {
- orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2));
+ orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN));
}
orderRebateVO.setSubsidyDesc("鍥㈤槦琛ヨ创");
- orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2) +"");
+ orderRebateVO.setSubsidy("楼" + teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN) +"");
+
+ hongBao = hongBao.add(teamSubsidy);
}
+
+ 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) {
+ upperTotalMoney = upperTotalMoney.add(hongBao);
orderRebateVO.setUpperFanLi("楼" + upperTotalMoney);
- orderRebateVO.setUserLevel(upperLevel.name());
orderRebateVO.setJumpLink(upperLevel.getDetailLink());
}
- // 濂栧姳鍒镐娇鐢�
- Date accountTime = hongBaoCountVO.getAccountTime();
- if (accountTime != null) {
- 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
- || (couponRecord.getCouponType() == CouponTypeEnum.rebatePercentCoupon.name() && couponRecord.getState() != UserSystemCouponRecord.STATE_SUCCESS)) {
- orderRebateVO.setCoupon(true);
+ 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) {
+ 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
+ || (couponRecord.getCouponType() == CouponTypeEnum.rebatePercentCoupon.name() && couponRecord.getState() != UserSystemCouponRecord.STATE_SUCCESS)) {
+ orderRebateVO.setCoupon(true);
+ orderRebateVO.setCouponType(1);
+ orderRebateVO.setCouponText("绔嬪嵆浣跨敤");
+ orderRebateVO.setCouponDesc("杩斿埄鍐嶈繑");
+ }
}
}
}
@@ -850,18 +766,6 @@
JSONObject data = new JSONObject();
data.put("result", orderRebateVO);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- }
-
-
- private BigDecimal getLowerSubsidy(BigDecimal money, Date downTime, UserLevelEnum buyerUserLevel, UserLevelEnum userLevel, boolean direct) {
- // 鍘熷姣斾緥
- BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,
- buyerUserLevel, userLevel, direct);
-
- // 灏忎竴绾ф瘮渚�
- BigDecimal darenRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime, buyerUserLevel, UserLevelEnum.daRen, direct);
-
- return MoneyBigDecimalUtil.mul(MoneyBigDecimalUtil.div(money,originRate), darenRate);
}
--
Gitblit v1.8.0