From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 46 +++++++++++-----------------------------------
1 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
index dba80bb..0bb8f33 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java
@@ -53,7 +53,6 @@
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.service.manger.order.TeamRewardManager;
-import com.yeshi.fanli.service.manger.order.TeamSubsidyManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
@@ -108,8 +107,6 @@
@Resource
private TeamRewardManager teamRewardManager;
- @Resource
- private TeamSubsidyManager teamSubsidyManager;
// 涓嬬骇琚皝绂侊紝绾㈠寘澶辨晥
private void invalidHongBaoForbidden(Long id) {
@@ -321,7 +318,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettleTB(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
+ public void shareSettleTB(Long uid, Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
@@ -367,7 +364,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettleJD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
+ public void shareSettleJD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
@@ -408,7 +405,7 @@
@Transactional(rollbackFor = Exception.class)
@Override
- public void shareSettlePDD(Long uid,Date maxPregetTime) throws OrderMoneySettleException {
+ public void shareSettlePDD(Long uid, Date maxPregetTime) throws OrderMoneySettleException {
/**
* 澶勭悊鍒嗕韩璧�
*/
@@ -665,7 +662,6 @@
List<Long> hbIdList = new ArrayList<>();
Set<String> drawBackOrders = new HashSet<String>();
List<Long> recieveHongBaoIds = new ArrayList<>();
- int shareGoodsCount = 0;
Set<String> shareOrders = new HashSet<>();
for (HongBaoV2 hongBao : hongBaoList) {
@@ -689,7 +685,6 @@
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());
if (hongBaoOrder != null) {
balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();
- shareGoodsCount += hongBaoOrder.getCommonOrder().getCount();
}
shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
if (balanceTime != null
@@ -724,9 +719,8 @@
}
// 鏂扮増閫氱煡
- userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,
- null);
+ userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, sharemoney,
+ userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
@@ -737,7 +731,8 @@
// 鎵�鏈夌殑杩斿埄鍒拌处绾㈠寘ID
for (Long hongBaoId : recieveHongBaoIds) {
try {
- HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);
+ if (Constant.ENABLE_MQ)
+ HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -756,7 +751,6 @@
BigDecimal sharemoney = new BigDecimal(0);
List<Long> hbIdList = new ArrayList<>();
List<Long> recieveHongBaoIds = new ArrayList<>();
- int shareGoodsCount = 0;
Set<String> shareOrders = new HashSet<>();
for (HongBaoV2 hongBao : hongBaoList) {
@@ -777,9 +771,6 @@
hbIdList.add(hongBao.getId());
// 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());
- if (hongBaoOrder != null) {
- shareGoodsCount += hongBaoOrder.getCommonOrder().getCount();
- }
shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
}
}
@@ -808,10 +799,8 @@
}
}
- // 鏂扮増閫氱煡
- userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),
- shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,
- null);
+ userMoneyMsgNotificationService.shareOrderReceived(uid, sourceType, sharemoney,
+ userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());
}
hongBaoV2SettleTempService.addTemp(recieveHongBaoIds, key);
@@ -819,27 +808,14 @@
// 鎵�鏈夌殑杩斿埄鍒拌处绾㈠寘ID
for (Long hongBaoId : recieveHongBaoIds) {
try {
- HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);
+ if (Constant.ENABLE_MQ)
+ HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);
} catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
}
}
- /**
- * 閭�璇疯ˉ璐寸粨绠�
- *
- * @param orderId
- * @param sourceType
- * @throws ParamsException
- * @throws TeamEincomeRecordException
- */
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void inviteSubsidySettle(Long uid, String taskKey, Date maxPreGetTime)
- throws OrderMoneySettleException, TeamEincomeRecordException, ParamsException {
- teamSubsidyManager.addToTeamEincome(uid, taskKey, maxPreGetTime);
- }
private String getTaskKey(Long uid) {
return uid + "-" + UUID.randomUUID().toString();
--
Gitblit v1.8.0