From 9eeda0d3049b71877c373c04d65533939b5582ef Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 02 九月 2019 09:55:55 +0800
Subject: [PATCH] getBoss方法只查询有效上级信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 168 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 122 insertions(+), 46 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index 361a7c3..5aba925 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -25,7 +25,6 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.HongBao;
import com.yeshi.fanli.dto.HongBaoDTO;
-import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.ThreeSale;
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
@@ -48,13 +47,13 @@
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
@Service
@@ -95,9 +94,6 @@
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
- @Resource
- private UserNotificationService userNotificationService;
@Resource
private UserOrderMsgNotificationService userOrderMsgNotificationService;
@@ -152,6 +148,8 @@
public void addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException {
Set<Integer> stateSet = new HashSet<>();// 璁㈠崟鐘舵�丼et
if (commonOrderList != null && commonOrderList.size() > 0) {
+ int orderType = commonOrderList.get(0).getSourceType();
+
Map<Integer, HongBaoOrder> notificationMap = new HashMap<>();
int goodsCount = 0;
boolean hasAdd = false;
@@ -183,32 +181,27 @@
BigDecimal money = notify.getMoney();
switch (t) {
case HongBaoV2.TYPE_ZIGOU:
- userNotificationService.orderFanliStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,
- null, money);
- userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, commonOrder.getPayment(),
- money, goodsCount, state);
+ userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state);
break;
case HongBaoV2.TYPE_SHARE_GOODS:
- userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,
- null, money);
- userOrderMsgNotificationService.orderShareStatistic(uid, orderId, commonOrder.getPayment(),
- money, goodsCount, state);
+
+ userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state);
break;
case HongBaoV2.TYPE_YIJI:
- userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
- MsgOrderDetail.STATE_FK, null, money);
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, commonOrder.getPayment(),
- money, goodsCount, state);
+
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state);
break;
case HongBaoV2.TYPE_ERJI:
- userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
- MsgOrderDetail.STATE_FK, null, money);
- userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, commonOrder.getPayment(),
- money, goodsCount, state);
+
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,
+ commonOrder.getPayment(), money, goodsCount, state);
break;
case HongBaoV2.TYPE_SHARE_YIJI:
- userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId,
+ userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId, orderType,
commonOrder.getPayment(), money, goodsCount, state, notify.getBeizhu());
break;
}
@@ -228,23 +221,23 @@
BigDecimal money = notify.getMoney();
switch (t) {
case HongBaoV2.TYPE_ZIGOU:
- userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId, commonOrder.getPayment(),
- money, state);
+ userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId, orderType,
+ commonOrder.getPayment(), money, state);
break;
case HongBaoV2.TYPE_SHARE_GOODS:
- userOrderMsgNotificationService.orderShareStateChanged(uid, orderId, commonOrder.getPayment(),
- money, state);
+ userOrderMsgNotificationService.orderShareStateChanged(uid, orderId, orderType,
+ commonOrder.getPayment(), money, state);
break;
case HongBaoV2.TYPE_YIJI:
- userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, commonOrder.getPayment(),
- money, state);
+ userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,
+ commonOrder.getPayment(), money, state);
break;
case HongBaoV2.TYPE_ERJI:
- userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, commonOrder.getPayment(),
- money, state);
+ userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,
+ commonOrder.getPayment(), money, state);
break;
case HongBaoV2.TYPE_SHARE_YIJI:
- userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId,
+ userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId, orderType,
commonOrder.getPayment(), money, state);
}
}
@@ -274,7 +267,7 @@
HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
throw new HongBaoException(10, "绾㈠寘瀵硅薄涓嶅瓨鍦�");
- // 宸茬粡澶辨晥鎴栬�呭凡缁忛鍙栫殑绾㈠寘涓嶅仛澶勭悊
+ // 宸茬粡澶辨晥锛屽凡缁忛鍙栵紝鏂拌�佺姸鎬佷竴鑷寸殑绾㈠寘涓嶅仛澶勭悊
if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
return;
@@ -290,7 +283,8 @@
payMent = commonOrder.getSettlement();
if (payMent.compareTo(new BigDecimal(10)) < 0) {
- mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getOrderNo());
+ mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getSourceType(),
+ commonOrder.getOrderNo());
}
}
@@ -307,13 +301,24 @@
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
- hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
+ if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 鎷煎澶�15澶╄繃1涓皬鏃跺埌璐�
+ hongBao.setPreGetTime(new Date(
+ commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 1L));
+ else
+ hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
if (mianDan)
hongBao.setMoney(commonOrder.getSettlement().compareTo(commonOrder.getPayment()) <= 0
? commonOrder.getSettlement() : commonOrder.getPayment());// 杩斿埄缁撶畻涓庝粯娆捐緝灏忕殑閲戦
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
+ }
+
+ // 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笉澶勭悊
+ if (oldHongBao.getState().intValue() == hongBao.getState())
+ return;
+
+ if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
try {
userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
@@ -323,6 +328,7 @@
}
}
}
+
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
// 鍔犲叆閫氱煡
@@ -499,7 +505,13 @@
}
}
} else if (type == HongBaoV2.TYPE_SHARE_GOODS) {
- BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+ BigDecimal fanliRate = null;
+ if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_TAOBAO
+ && commonOrder.getSourcePosition().equalsIgnoreCase(TaoBaoConstant.TAOBAO_TLJ_RELATION_PID_DEFAULT))
+ fanliRate = hongBaoManageService.getTLJShareRate(commonOrder.getCreateTime().getTime());
+ else
+ fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+
List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService
.listByOrderIdAndUid(commonOrder.getUserInfo().getId(), commonOrder.getOrderNo());
if (list != null && list.size() > 0) {
@@ -589,21 +601,23 @@
if (notificationMap.get(child.getType()) == null) {
HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
tempHongBao.setUserInfo(child.getUserInfo());
- tempHongBao.setMoney(childUpdate.getMoney());
+ tempHongBao
+ .setMoney(childUpdate.getMoney() == null ? new BigDecimal(0) : childUpdate.getMoney());
CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
tempCommonOrder.setPayment(commonOrder.getPayment());
notificationMap.put(child.getType(), new HongBaoOrder(tempCommonOrder, tempHongBao));
} else {
// 澧炲姞浠樻閲戦涓庤祫閲�
HongBaoOrder tempHongBaoOrder = notificationMap.get(child.getType());
- tempHongBaoOrder.getCommonOrder().setPayment(
- tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
- tempHongBaoOrder.getHongBaoV2()
- .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(childUpdate.getMoney()));
+ if (commonOrder.getPayment() != null)
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ if (childUpdate.getMoney() != null)
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(childUpdate.getMoney()));
notificationMap.put(child.getType(), tempHongBaoOrder);
}
-
-
+
}
} else
throw new HongBaoException(2, "type閿欒");
@@ -617,7 +631,7 @@
// 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
BigDecimal mianDanMoney = null;
if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
- List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),
commonOrder.getOrderNo());
if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟
BigDecimal payMent = commonOrder.getPayment();
@@ -641,6 +655,7 @@
}
}
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 璁剧疆鍏嶅崟鍒稿け鏁�
+ commonOrder.setPayment(new BigDecimal(0));// 璁㈠崟澶辨晥鍚庣殑浠樻閲戦璁剧疆涓�0
try {
userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
} catch (Exception e) {
@@ -661,7 +676,11 @@
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
- hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
+ if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_PDD)// 鎷煎澶�15澶╁崐鍒拌处
+ hongBao.setPreGetTime(new Date(
+ commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L + 1000 * 60 * 60 * 12L));
+ else
+ hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
@@ -729,6 +748,10 @@
firstHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
}
+ // 杩斿埄涓�0鐨勪笉閫氱煡
+ if (firstHongbao.getMoney() == null || firstHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
+ return;
+
hongBaoV2Mapper.insertSelective(firstHongbao);
// 鐢ㄦ埛閫氱煡
if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {
@@ -776,6 +799,11 @@
secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
}
+
+ // 杩斿埄涓�0鐨勪笉缁熻
+ if (secondHongbao.getMoney() == null || secondHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
+ return;
+
hongBaoV2Mapper.insertSelective(secondHongbao);
// 鐢ㄦ埛閫氱煡
@@ -804,7 +832,12 @@
if (commonOrder.getState() == CommonOrder.STATE_SX || commonOrder.getState() == CommonOrder.STATE_WQ)
return;
// 鍒嗕韩璧�
- BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+ BigDecimal shareRate = null;
+ if (commonOrder.getSourceType() == Constant.SOURCE_TYPE_TAOBAO
+ && commonOrder.getSourcePosition().equalsIgnoreCase(TaoBaoConstant.TAOBAO_TLJ_RELATION_PID_DEFAULT))// 鏉ヨ嚜浜庢窐绀奸噾鐨勫垎浜�
+ shareRate = hongBaoManageService.getTLJShareRate(commonOrder.getCreateTime().getTime());
+ else
+ shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
// 鍒ゆ柇璁㈠崟鍒嗕韩娲诲姩鏄惁寮�鍚�
if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {
@@ -943,7 +976,7 @@
hb.setMoney(hongBao.getMoney());
try {
- userShareGoodsGroupService.updateOrderRecord(hb);
+ userShareGoodsGroupService.updateOrderRecord(hb, commonOrder.getSourceType());
} catch (UserShareGoodsRecordException e) {
try {
LogHelper.errorDetailInfo(e);
@@ -1023,4 +1056,47 @@
else
return money;
}
+
+ @Override
+ public List<HongBaoV2> listChildrenById(Long id) {
+ return hongBaoV2Mapper.listChildrenById(id);
+ }
+
+ @Override
+ public List<Long> getUidByNear30DayShareSucceed() {
+ return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
+ }
+
+ @Override
+ public void invalidInviteHongBaoByParentUid(Long parentUid, String beiZhu) {
+ List<Integer> typeList = new ArrayList<>();
+ typeList.add(HongBaoV2.TYPE_YIJI);
+ typeList.add(HongBaoV2.TYPE_ERJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_YIJI);
+ typeList.add(HongBaoV2.TYPE_SHARE_ERJI);
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(HongBaoV2.STATE_KELINGQU);
+ stateList.add(HongBaoV2.STATE_BUKELINGQU);
+ long count = hongBaoV2Mapper.countByParentUidAndTypeAndState(parentUid, typeList, stateList);
+ int page = (int) (count % 100 == 0 ? count / 100 : count / 100 + 1);
+ for (int i = 1; i <= page; i++) {
+ List<HongBaoV2> list = hongBaoV2Mapper.listByParentUidAndTypeAndState(parentUid, typeList, stateList, 0,
+ 100);
+ if (list != null)
+ for (HongBaoV2 v2 : list) {
+ HongBaoV2 update = new HongBaoV2(v2.getId());
+ update.setUpdateTime(new Date());
+ update.setState(HongBaoV2.STATE_SHIXIAO);
+ update.setBeizhu(beiZhu);
+ hongBaoV2Mapper.updateByPrimaryKeySelective(update);
+ }
+ }
+ }
+
+ @Override
+ public List<HongBaoV2> listBySourceTypeAndTradeIdListAndUid(int sourceType, long uid, List<String> tradeIdList) {
+ if (tradeIdList == null || tradeIdList.size() == 0)
+ return null;
+ return hongBaoV2Mapper.listBySourceTypeAndTradeIdListAndUid(sourceType, uid, tradeIdList);
+ }
}
--
Gitblit v1.8.0