From e7920b14a9baab97035a1a529da85d124a2bcacd Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 16 六月 2020 10:54:29 +0800
Subject: [PATCH] 云发单对测试用户显示
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 640 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 371 insertions(+), 269 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 5f42f04..14ba6dd 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
@@ -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.SimpleDateFormat;
import java.util.ArrayList;
@@ -18,8 +19,18 @@
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.NumberUtil;
+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.dto.order.SearchFilterOrder;
+import com.yeshi.fanli.dto.order.UserTeamLevel;
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.ThreeSaleDetail;
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;
@@ -27,7 +38,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
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.UserOrderWeiQuanRecord;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
@@ -40,14 +51,19 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
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.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMoneyComputeService;
+import com.yeshi.fanli.service.inter.order.UserOrderWeiQuanRecordService;
+import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderService;
+import com.yeshi.fanli.service.inter.order.dividents.TeamDividentsSourceOrderUserMapService;
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.ThreeSaleDetailService;
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;
@@ -55,15 +71,17 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
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.CurrentBonusVO;
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.TeamOrderVO;
+import com.yeshi.fanli.vo.user.MineInfoVO;
import com.yeshi.fanli.vo.user.UserInfoExtraVO;
import com.yeshi.fanli.vo.user.UserSettingsVO;
@@ -101,7 +119,7 @@
private UserVIPInfoService userVIPInfoService;
@Resource
- private InviteOrderSubsidyService inviteOrderSubsidyServiceV2;
+ private HongBaoV2Service hongBaoV2Service;
@Resource
private HongBaoOrderService hongBaoOrderService;
@@ -111,71 +129,71 @@
@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;
+
+ @Resource
+ private TeamDividentsSourceOrderService teamDividentsSourceOrderService;
+
+ @Resource
+ private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;
+
+ @Resource
+ private UserOrderWeiQuanRecordService userOrderWeiQuanRecordService;
+
+ @Resource
+ private ThreeSaleDetailService threeSaleDetailService;
+
/**
- * 璁㈠崟鍒楄〃
+ * 澶勭悊鎼滅储鏉′欢
*
- * @param acceptData
- * @param page
- * @param uid
- * @param state
- * 鐘舵�侊細0鍏ㄩ儴 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁� 4宸叉敹璐�
- * @param type
- * 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
- * @param orderState
- * 1鏈夋晥璁㈠崟 2 缁存潈璁㈠崟 3澶辨晥璁㈠崟
- * @param orderNo
- * 璁㈠崟鍙�
- * @param startTime
- * 璧峰鏃堕棿
- * @param endTime
- * 缁撴潫鏃堕棿
- * @param slotTime
- * 鏃堕棿娈碉細1-鏈�杩戜笁澶� 2-鏈�杩戜竷澶� 3鏈�杩戝崐鏈� 4鏈湀 5杩戜笁鏈� 6杩戝崐骞�
- * @param dateType
- * 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈� |
- * @param source
- * 椤甸潰鏉ユ簮锛歸elfareCore-绂忓埄涓績銆乥onus -濂栭噾缁熻锛堟垜鐨勭晫闈級
- * @param out
+ * @param filter
*/
- @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) {
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
- return;
+ private void handleSearchFilter(SearchFilterOrder filter) {
+ Integer goodsType = filter.getGoodsType();
+ if (goodsType != null && goodsType == 0) {
+ goodsType = null;
+ filter.setGoodsType(goodsType);
}
- if (page == null || page < 1)
- page = 1;
-
- // 鎼滅储鍐呭銆佽鍗曞彿
- if (!StringUtil.isNullOrEmpty(orderNo)
- && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
- searchOrder(acceptData, orderNo, page, uid, out);
- return;
+ List<Integer> listSource = new ArrayList<>();
+ if (goodsType != null) {
+ listSource.add(goodsType);
}
+ filter.setListSource(listSource);
+
+ // 璁㈠崟绫诲瀷
+ String type = filter.getType();
+ Integer orderType = null;
+ if (StringUtil.isNullOrEmpty(type)) {
+ orderType = null;
+ } else if (!"0".equalsIgnoreCase(type)) {
+ orderType = Integer.parseInt(type);
+ }
+ filter.setOrderType(orderType);
// 杞崲鐘舵��
+ Integer orderState = filter.getOrderState();
+ Integer state = filter.getState();
if (state != null) {
if (state == 0) {
state = null; // 鎵�鏈�
@@ -190,19 +208,14 @@
if (state != null && orderState != null && (orderState == 2 || orderState == 3)) {
state = null;
}
-
- // 璁㈠崟绫诲瀷
- Integer orderType = null;
- if (StringUtil.isNullOrEmpty(type)) {
- orderType = null;
- } else if (!"0".equalsIgnoreCase(type)) {
- orderType = Integer.parseInt(type);
- }
-
- if (goodsType != null && goodsType == 0)
- goodsType = null;
+ filter.setState(state);
+ filter.setOrderState(orderState);
// 绛涢�夋椂闂�
+ Integer dateType = filter.getDateType();
+ String startTime = filter.getStartTime();
+ String endTime = filter.getEndTime();
+ Integer slotTime = filter.getSlotTime();
if (slotTime != null) {
try {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
@@ -236,28 +249,81 @@
e.printStackTrace();
}
}
+ filter.setDateType(dateType);
+ filter.setStartTime(startTime);
if (endTime != null && endTime.trim().length() > 0) {
endTime += " 23:59:59";
}
+ filter.setEndTime(endTime);
- List<Integer> listSource = new ArrayList<>();
- if (goodsType != null) {
- listSource.add(goodsType);
+ }
+
+ /**
+ * 璁㈠崟鍒楄〃
+ *
+ * @param acceptData
+ * @param page
+ * @param uid
+ * @param state 鐘舵�侊細0鍏ㄩ儴 1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁� 4宸叉敹璐�
+ * @param type 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
+ * @param orderState 1鏈夋晥璁㈠崟 2 缁存潈璁㈠崟 3澶辨晥璁㈠崟
+ * @param orderNo 璁㈠崟鍙�
+ * @param startTime 璧峰鏃堕棿
+ * @param endTime 缁撴潫鏃堕棿
+ * @param slotTime 鏃堕棿娈碉細1-鏈�杩戜笁澶� 2-鏈�杩戜竷澶� 3鏈�杩戝崐鏈� 4鏈湀 5杩戜笁鏈� 6杩戝崐骞�
+ * @param dateType 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈� |
+ * @param source 椤甸潰鏉ユ簮锛歸elfareCore-绂忓埄涓績銆乥onus -濂栭噾缁熻锛堟垜鐨勭晫闈級
+ * @param out
+ */
+ @RequestMapping(value = "getOrderList", method = RequestMethod.POST)
+ public void getOrderList(AcceptData acceptData, Integer page, SearchFilterOrder filter, PrintWriter out) {
+ Long uid = filter.getUid();
+ if (uid == null) {
+ out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ return;
}
+ if (page == null || page < 1)
+ page = 1;
+
+ handleSearchFilter(filter);
+ String startTime = filter.getStartTime();
+ String endTime = filter.getEndTime();
+ Integer orderType = filter.getOrderType();
+ Integer dateType = filter.getDateType();
+ Integer state = filter.getState();
+ List<Integer> listSource = filter.getListSource();
+ Integer orderState = filter.getOrderState();
+
try {
+ if (!VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (listSource.size() == 0) {
+ listSource.add(Constant.SOURCE_TYPE_TAOBAO);
+ listSource.add(Constant.SOURCE_TYPE_JD);
+ listSource.add(Constant.SOURCE_TYPE_PDD);
+ }
+ }
+
+ // 鎼滅储鍐呭銆佽鍗曞彿
+ String orderNo = filter.getOrderNo();
+ if (!StringUtil.isNullOrEmpty(orderNo)
+ && VersionUtil.greaterThan_2_0_6(acceptData.getPlatform(), acceptData.getVersion())) {
+ searchOrder(acceptData, orderNo, page, uid, listSource, out);
+ return;
+ }
+
// 绛涢�夌粨鏋滈《閮ㄧ粺璁�
String validMoney = "0.00";
String invalidMoney = "0.00";
if (page == 1) {
- BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 1,
- orderNo, state, startTime, endTime, listSource);
+ BigDecimal predictMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, filter.getDateType(),
+ orderType, 1, orderNo, state, startTime, endTime, listSource);
if (predictMoney != null)
validMoney = predictMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
- BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, dateType, orderType, 2,
- orderNo, state, startTime, endTime, listSource);
+ BigDecimal postSaleMoney = hongBaoV2CountService.getRewardMoneyByToSearch(uid, filter.getDateType(),
+ orderType, 2, orderNo, state, startTime, endTime, listSource);
if (postSaleMoney != null)
invalidMoney = postSaleMoney.setScale(2, BigDecimal.ROUND_DOWN).toString();
@@ -269,20 +335,20 @@
}
}
}
-
-
+
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,
+ 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,
+ 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娆¤Е鍙�
@@ -311,16 +377,19 @@
/**
* 鎼滅储璁㈠崟
+ *
* @param key
* @param out
*/
- private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, PrintWriter out) {
+ private void searchOrder(AcceptData acceptData, String key, Integer page, Long uid, List<Integer> listSource, PrintWriter out) {
try {
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);
+ if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ list = commonOrderService.getOrderList(acceptData, page, uid, null, null, null, key, null, null, null,listSource);
+ } else
+ list = commonOrderService.getOrderByUid(acceptData, page, uid, null, null, null, key, null, null, null, listSource);
}
if (list == null || list.size() == 0) {
@@ -352,9 +421,7 @@
* 鐢ㄦ埛璁㈠崟缁熻
*
* @param acceptData
- * @param uid
- * 鐢ㄦ埛id
- * type 绫诲瀷锛�0鍏ㄩ儴銆�1娣樺疂 2浜笢銆佹嫾澶氬
+ * @param uid 鐢ㄦ埛id type 绫诲瀷锛�0鍏ㄩ儴銆�1娣樺疂 2浜笢銆佹嫾澶氬
* @param out
*/
@RequestMapping(value = "getOrderCount", method = RequestMethod.POST)
@@ -422,9 +489,10 @@
/**
* 缁熻濂栭噾
+ *
* @param acceptData
* @param uid
- * @param dateType 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈�
+ * @param dateType 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈�
* @param out
*/
@RequestMapping(value = "getBonusCount", method = RequestMethod.POST)
@@ -452,42 +520,42 @@
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_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);
- if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- teamMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, dateType, 3, null);
- } else {
- BigDecimal bonus = null;
- BigDecimal subsidy = null;
- BigDecimal dividend = null; // TODO 鍒嗙孩缁熻
- if (dateType == 4) { // 宸插埌璐�
- dividend = new BigDecimal(0);
- bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 2);
- subsidy = inviteOrderSubsidyServiceV2.sumMoneyByUidAndDateAndState(uid,dateType,null,3);
- } else { // 鏈け鏁�
- bonus = hongBaoV2CountService.geBonusByuid(uid, dateType, 3, 4);
- subsidy = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,dateType,null);
- }
-
- dividend = new BigDecimal(0);
- // 鎬诲洟闃熷鍔�
- teamMoney = bonus.add(subsidy).add(dividend);
- }
data.put("inviteMoney", teamMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
out.print(JsonUtil.loadTrueResult(data));
}
-
/**
* 杩斿埄璇存槑
+ *
* @param acceptData
* @param uid
* @param orderNo
@@ -509,9 +577,10 @@
}
// 绾㈠寘淇℃伅
- List<HongBaoOrder> hoList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType, uid);
+ List<HongBaoOrder> hoList = hongBaoOrderService.listDetailByOrderIdAndSourceTypeAndUid(orderNo, sourceType,
+ uid);
HongBaoCountVO hongBaoCountVO = hongBaoOrderService.getHongBaoCountVO(hoList);
-
+
Integer hongBaoState = hongBaoCountVO.getCurrentState();
String stateDesc = "";
String predictDesc = "";
@@ -523,7 +592,7 @@
} else if (HongBaoV2.STATE_SHIXIAO == hongBaoState) {
stateDesc = "宸插け鏁�";
}
-
+
int type = 0;
String typeName = "";
int hongBaoType = hoList.get(0).getHongBaoV2().getType();
@@ -538,8 +607,8 @@
|| HongBaoV2.TYPE_ERJI == hongBaoType) {
type = 3;
typeName = "鏀剁泭";
- }
-
+ }
+
List<Long> goodsIdList = new ArrayList<>();
if (hoList != null)
for (HongBaoOrder hongBaoOrder : hoList) {
@@ -552,8 +621,7 @@
if (goodsList != null)
for (CommonOrderGoods goods : goodsList)
orderGoodsMap.put(goods.getId(), goods);
-
-
+
OrderRebateVO orderRebateVO = new OrderRebateVO();
// 绾㈠寘淇℃伅
BigDecimal hongBao = hongBaoCountVO.getValidMoney();
@@ -561,9 +629,9 @@
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));
+ orderRebateVO.setWqMoney("楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN));
if (hongBao.compareTo(weiQuanMoney) > 0) {
orderRebateVO.setWqDesc("閮ㄥ垎鍞悗閫�鍥�");
} else {
@@ -573,111 +641,97 @@
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;
-
+ 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();
- if (hongBaoOrder.getCommonOrder().getSettlement() != null)
+ // 鑻ュ凡缁撶畻 -鏄剧ず缁撶畻閲戦
+ 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.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);
+ 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) +"");
+ goodsVO.setBonus("楼" + fanli.setScale(2, BigDecimal.ROUND_DOWN) + "");
}
-
+
voList.add(goodsVO);
-
- if (type == 1 ) {
- 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;
- BigDecimal lowerSubsidy = null;
- 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;
+ 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) {
- direct = true;
+ 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));
}
-
- BigDecimal originRate = orderHongBaoMoneyComputeService.getTeamSubsidyRate(downTime,buyerUserLevel, userLevel, direct);
-
- // 璁＄畻杈句汉琛ヨ创
- if (userLevel != UserLevelEnum.daRen) {
- 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);
- lowerSubsidy = BigDecimal.valueOf(0.00);
}
-
- if (userLevel != UserLevelEnum.daRen) {
- orderRebateVO.setOriginSubsidy("楼" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN));
- }
- orderRebateVO.setSubsidyDesc("鍥㈤槦琛ヨ创");
- 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);
@@ -686,10 +740,9 @@
} else {
orderRebateVO.setUserLevel(userLevel.name());
}
-
- // 涓婄骇杩斿埄
+
+ // 瓒呯骇浼氬憳杩斿埄
if (upperLevel != null) {
- upperTotalMoney = upperTotalMoney.add(hongBao);
orderRebateVO.setUpperFanLi("楼" + upperTotalMoney);
orderRebateVO.setJumpLink(upperLevel.getDetailLink());
}
@@ -698,23 +751,26 @@
boolean rewardSuccess = false;
List<String> listNo = new ArrayList<String>();
listNo.add(orderNo);
- List<UserSystemCouponRecord> useRecord = userSystemCouponRecordService.getRecordByOrderNoList(sourceType, listNo);
+ 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) {
+ 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)
+ } else if (CouponTypeEnum.freeCoupon.name().equals(cType)
+ || CouponTypeEnum.welfareFreeCoupon.name().equals(cType)
|| CouponTypeEnum.freeCouponBuy.name().equals(cType)) {
freeState = state;
break;
}
}
}
-
- if (rewardSuccess) { // 宸蹭娇鐢ㄥ鍔卞埜
+
+ if (rewardSuccess) { // 宸蹭娇鐢ㄥ鍔卞埜
JSONObject params = new JSONObject();
params.put("orderNo", orderNo);
params.put("goodsType", sourceType + "");
@@ -725,7 +781,7 @@
orderRebateVO.setCouponType(1);
orderRebateVO.setCouponUse(true);
orderRebateVO.setCouponText("濂栧姳鎴愬姛");
- orderRebateVO.setCouponDesc("宸插啀杩斅�" +couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
+ orderRebateVO.setCouponDesc("宸插啀杩斅�" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
orderRebateVO.setCouponParams(params.toString());
orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));
} else if (freeState > 0) { // 宸蹭娇鐢ㄥ厤鍗曞埜
@@ -746,14 +802,15 @@
}
} else {
Date accountTime = hongBaoV2.getGetTime();
- if (accountTime != null) {
+ // 鍒拌处鏃堕棿 -绾㈠寘閲戦闄愬埗
+ 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
- || (couponRecord.getCouponType() == CouponTypeEnum.rebatePercentCoupon.name() && couponRecord.getState() != UserSystemCouponRecord.STATE_SUCCESS)) {
+ UserSystemCouponRecord couponRecord = userSystemCouponRecordService.getRecordByOrderNo(orderNo,
+ null);
+ if (couponRecord == null) {
orderRebateVO.setCoupon(true);
orderRebateVO.setCouponType(1);
orderRebateVO.setCouponText("绔嬪嵆浣跨敤");
@@ -762,93 +819,138 @@
}
}
}
-
+
JSONObject data = new JSONObject();
data.put("result", orderRebateVO);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
}
-
-
+
/**
- * 鏁版嵁缁熻
+ * 鐢ㄦ埛璁㈠崟缁熻
+ *
* @param acceptData
- * @param uid
- * @param type 1鑷喘 2鍒嗕韩 3鍥㈤槦
+ * @param uid 鐢ㄦ埛id type 绫诲瀷锛�0鍏ㄩ儴銆�1娣樺疂 2浜笢銆佹嫾澶氬
* @param out
*/
- @RequestMapping(value = "getCurrentBonus", method = RequestMethod.POST)
- public void getCurrentBonus(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {
+ @RequestMapping(value = "teamOrderSearch")
+ public void teamOrderSearch(String callback, AcceptData acceptData, Long uid, Integer page, String key,
+ PrintWriter out) {
if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
return;
}
- JSONObject data = new JSONObject();
- if (type == 1 || type == 2) {
- CurrentBonusVO bonus = new CurrentBonusVO();
- bonus.setToday(hongBaoV2CountService.geBonusByuid(uid, 1, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setYesterday(hongBaoV2CountService.geBonusByuid(uid, 2, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setThisMonth(hongBaoV2CountService.geBonusByuid(uid, 3, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setLastMonth(hongBaoV2CountService.geBonusByuid(uid, 4, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- CurrentBonusVO bonusNot = new CurrentBonusVO();
- bonusNot.setToday(hongBaoV2CountService.geBonusByuid(uid, 1, type, 1).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonusNot.setYesterday(hongBaoV2CountService.geBonusByuid(uid, 2, type, 1).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonusNot.setThisMonth(hongBaoV2CountService.geBonusByuid(uid, 3, type, 1).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonusNot.setLastMonth(hongBaoV2CountService.geBonusByuid(uid, 4, type, 1).setScale(2, BigDecimal.ROUND_DOWN).toString());
-
-
- data.put("bonus",bonus);
- data.put("bonusNot",bonusNot);
- data.put("total", hongBaoV2CountService.geBonusByuid(uid, null, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("totalNot", hongBaoV2CountService.geBonusByuid(uid, null, type, 1).setScale(2, BigDecimal.ROUND_DOWN).toString());
- } else {
- CurrentBonusVO bonus = new CurrentBonusVO();
- bonus.setToday(hongBaoV2CountService.geBonusByuid(uid, 1, type, 4).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setYesterday(hongBaoV2CountService.geBonusByuid(uid, 2, type, 4).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setThisMonth(hongBaoV2CountService.geBonusByuid(uid, 3, type, 4).setScale(2, BigDecimal.ROUND_DOWN).toString());
- bonus.setLastMonth(hongBaoV2CountService.geBonusByuid(uid, 4, type, 2).setScale(2, BigDecimal.ROUND_DOWN).toString());
-
-
- CurrentBonusVO subsidy = new CurrentBonusVO();
- subsidy.setToday(inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,1,null).setScale(2, BigDecimal.ROUND_DOWN).toString());
- subsidy.setYesterday(inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,2,null).setScale(2, BigDecimal.ROUND_DOWN).toString());
- subsidy.setThisMonth(inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid,3,null).setScale(2, BigDecimal.ROUND_DOWN).toString());
- subsidy.setLastMonth(inviteOrderSubsidyServiceV2.sumMoneyByUidAndDateAndState(uid,4,null,3).setScale(2, BigDecimal.ROUND_DOWN).toString());
-
- // TODO 鍒嗙孩缁熻
- CurrentBonusVO dividend = new CurrentBonusVO();
- dividend.setThisMonth("0.00");
- dividend.setLastMonth("0.00");
-
- BigDecimal totalBonus = hongBaoV2CountService.geBonusByuid(uid, null, type, 2);
- BigDecimal totalubsidy = inviteOrderSubsidyServiceV2.sumRecievedMoneyByUid(uid,null);
- BigDecimal totalDividend = new BigDecimal(0);
-
- BigDecimal total = totalDividend.add(totalBonus).add(totalubsidy);
-
-
- data.put("bonus",bonus);
- data.put("subsidy",subsidy);
- data.put("dividend",dividend);
- data.put("subsidy",subsidy);
- data.put("total", total.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("totalBonus", totalBonus.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("totalubsidy", totalubsidy.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("totalDividend", totalDividend.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ List<TeamOrderVO> resultList = new ArrayList<>();
+ if (StringUtil.isNullOrEmpty(key)) {
+ JSONObject data = new JSONObject();
+ data.put("count", 0);
+ data.put("list", resultList);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ return;
}
-
- String key = null;
- if (type == 1) {
- key = ConfigKeyEnum.bonusCountLinkFanli.getKey();
- } else if (type == 2) {
- key = ConfigKeyEnum.bonusCountLinkShare.getKey();
- } else {
- key = ConfigKeyEnum.bonusCountLinkTeam.getKey();
+
+ try {
+ if (page == null)
+ page = 1;
+
+ List<TeamOrderVO> list = teamDividentsSourceOrderUserMapService.searchByOrderNoOrSourceUid((page - 1) * 20,
+ 20, uid, key);
+ if (list == null) {
+ list = new ArrayList<>();
+ }
+
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ TeamOrderVO teamVO = list.get(i);
+ // 绮変笣浠ｆ暟
+ ThreeSaleDetail threeDetail = threeSaleDetailService.getByBossUidAndWorkerUid(uid, teamVO.getUid());
+ if (threeDetail == null) {
+ list.remove(i);
+ i--;
+ continue;
+ }
+ teamVO.setTeamGrade(threeDetail.getLevel());
+
+ // 绮変笣鍩烘湰淇℃伅
+ UserInfo userInfo = userInfoService.getUserByIdWithMybatis(teamVO.getUid());
+ if (userInfo == null) {
+ list.remove(i);
+ i--;
+ continue;
+ }
+ teamVO.setNickName(userInfo.getNickName());
+ teamVO.setPortrait(userInfo.getPortrait());
+
+ BigDecimal payment = BigDecimal.ZERO;
+ List<CommonOrder> listOrder = commonOrderService.listBySourceTypeAndOrderId(teamVO.getSourceType(),
+ teamVO.getOrderNo());
+ if (listOrder != null && listOrder.size() > 0) {
+ for (CommonOrder order : listOrder) {
+ payment = payment.add(order.getPayment());
+ teamVO.setSourceName(order.getChildSourceType());
+ teamVO.setDownTime(TimeUtil.formatDate(order.getThirdCreateTime()));
+
+ // 涓嬪崟鏃剁瓑绾�
+ UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(order.getUrank());
+ if (userLevel == null)
+ userLevel = UserLevelEnum.daRen;
+ teamVO.setUserRank(UserLevelUtil.getShowLevel(userLevel).name());
+
+ // 缁撶畻鏃堕棿
+ Date settleTime = order.getSettleTime();
+ if (settleTime != null)
+ teamVO.setSettleTime(TimeUtil.formatDate(settleTime));
+
+ // 缁存潈淇℃伅
+ Integer orderState = order.getState();
+ if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())
+ && CommonOrder.STATE_WQ == orderState) {
+ if (order.getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {
+ UserOrderWeiQuanRecord record = userOrderWeiQuanRecordService
+ .selectByOrderInfoAndUid(uid, order.getTradeId(), order.getSourceType());
+ if (record != null) {
+ teamVO.setServiceTime(TimeUtil.formatDate(record.getCreateTime()));
+ }
+ }
+ }
+
+ }
+ }
+ teamVO.setPayment(payment);
+
+ // 璁㈠崟鏃堕棿淇℃伅
+ String orderTime = "涓嬪崟" + teamVO.getDownTime();
+ if (!StringUtil.isNullOrEmpty(teamVO.getSettleTime())) {
+ orderTime += "\n鏀惰揣" + teamVO.getSettleTime();
+ }
+ if (!StringUtil.isNullOrEmpty(teamVO.getServiceTime())) {
+ orderTime += "\n鍞悗" + teamVO.getServiceTime();
+ }
+ teamVO.setOrderTime(orderTime);
+ }
+ }
+
+ GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
+ 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, BigDecimal.ROUND_DOWN);
+ return new JsonPrimitive(value.toString());
+ }
+ }
+ });
+ Gson gson = gsonBuilder.create();
+ JSONObject data = new JSONObject();
+ data.put("count", teamDividentsSourceOrderUserMapService.countSearchByOrderNoOrSourceUid(uid, key));
+ data.put("list", gson.toJson(list));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鐢ㄦ埛涓嶅瓨鍦�"));
+ return;
}
-
- data.put("link",configService.get(key));
- out.print(JsonUtil.loadTrueResult(data));
}
-
}
--
Gitblit v1.8.0