From 3727469752a977dde6327e2c48d761b20b565d3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 七月 2022 09:19:21 +0800
Subject: [PATCH] 商品ID字符串化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 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 8a3466f..71d32ad 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
@@ -13,6 +13,8 @@
import javax.annotation.Resource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,8 @@
@Service
public class OrderMoneySettleServiceImpl implements OrderMoneySettleService {
+
+ Logger logger = LoggerFactory.getLogger(OrderMoneySettleService.class);
@Resource
private HongBaoV2Mapper hongBaoV2Mapper;
@@ -272,7 +276,7 @@
@Override
public TransactionStatus execute(Message arg0, Object arg1) {
try {
- fanLiShareTB(hongBaoList, uid, taskKey);
+ fanLiShareTB(hongBaoList, uid, taskKey,maxPregetTime);
} catch (TaoBaoWeiQuanException e) {
return TransactionStatus.RollbackTransaction;
}
@@ -316,7 +320,7 @@
orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@Override
public TransactionStatus execute(Message arg0, Object arg1) {
- fanLiShareOther(hongBaoList, uid, sourceType, taskKey);
+ fanLiShareOther(hongBaoList, uid, sourceType, taskKey,maxPregetTime);
return TransactionStatus.CommitTransaction;
}
}, null);
@@ -372,7 +376,7 @@
orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@Override
public TransactionStatus execute(Message arg0, Object arg1) {
- fanLiShareOther(hongBaoList, uid, sourceType, taskKey);
+ fanLiShareOther(hongBaoList, uid, sourceType, taskKey,maxPregetTime);
return TransactionStatus.CommitTransaction;
}
}, null);
@@ -392,6 +396,9 @@
Map<Long, Integer> userGoodsCount = new HashMap<>();
for (CommonOrder co : orderList) {
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(co.getId());
+ if (hongBaoOrder == null) {
+ continue;
+ }
hongBaoList.add(hongBaoOrder.getHongBaoV2());
Long uid = co.getUserInfo().getId();
if (userGoodsCount.get(uid) == null)
@@ -530,6 +537,7 @@
private void fanliInvite(List<HongBaoV2> hongBaoList, Long uid, int sourceType, String key, Date maxPreGetTime)
throws TeamEincomeRecordException, ParamsException, TeamRewardDebtException {
+ logger.info("閭�璇峰閲戦鍒拌处锛歶id-{} sourceType-{} key-{}", new Object[]{uid, sourceType, key});
List<Long> hbIdList = new ArrayList<>();
BigDecimal invitemoney = new BigDecimal(0);
Set<String> inviteOrders = new HashSet<>();
@@ -541,6 +549,7 @@
continue;
hongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBao.getId());
if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU || hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
+ logger.info("閭�璇峰閲戦鍒拌处-姣忎釜绾㈠寘-鍒拌处寮�濮嬶細hongbaoid-{}", hongBao.getId());
TeamRewardDebt debt = teamRewardDebtService.selectBySourceId(hongBao.getId());
BigDecimal money = hongBao.getMoney();
if (debt != null && debt.getLeftMoney().compareTo(new BigDecimal(0)) > 0
@@ -548,8 +557,9 @@
money = money.subtract(debt.getLeftMoney());
// 杩橀挶
teamRewardDebtService.repayDebt(debt.getId(), debt.getLeftMoney(), null);
+ logger.info("閭�璇峰閲戦鍒拌处-姣忎釜绾㈠寘-杩樻锛歨ongbaoid-{} debtId-{} debtMoney-{}", new Object[]{hongBao.getId(), debt.getId(), debt.getLeftMoney()});
}
-
+ logger.info("閭�璇峰閲戦鍒拌处-姣忎釜绾㈠寘锛歨ongbaoid-{} money-{}", new Object[]{hongBao.getId(), money});
invitemoney = invitemoney.add(money);
HongBaoV2 updateHongBao = new HongBaoV2();
updateHongBao.setId(hongBao.getId());
@@ -561,6 +571,7 @@
hbIdList.add(hongBao.getId());
HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getParent().getId());
inviteOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());
+ logger.info("閭�璇峰閲戦鍒拌处-姣忎釜绾㈠寘-鍒拌处鎴愬姛锛歨ongbaoid-{}", hongBao.getId());
}
}
@@ -568,6 +579,7 @@
if (invitemoney.compareTo(new BigDecimal(0)) > 0) {
// 鑾峰彇褰撳墠鐨勬湀浠�
teamRewardManager.addToEincome(uid, maxPreGetTime, invitemoney, sourceType);
+ logger.info("閭�璇峰閲戦鍒拌处-娣诲姞鍒板洟闃熸敹鐩婃垚鍔燂細uid-{} day-{} money-{} sourceType-{}", new Object[]{uid, maxPreGetTime, invitemoney, sourceType});
}
hongBaoV2SettleTempService.addTemp(hbIdList, key);
@@ -590,7 +602,7 @@
* @param uid
* @throws TaoBaoWeiQuanException
*/
- private void fanLiShareTB(List<HongBaoV2> hongBaoList, Long uid, String key) throws TaoBaoWeiQuanException {
+ private void fanLiShareTB(List<HongBaoV2> hongBaoList, Long uid, String key,Date recieveMonth) throws TaoBaoWeiQuanException {
BigDecimal sharemoney = new BigDecimal(0);
List<Long> hbIdList = new ArrayList<>();
Set<String> drawBackOrders = new HashSet<String>();
@@ -635,7 +647,7 @@
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
- sharemoney, new Date());
+ sharemoney,recieveMonth);
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
@@ -680,7 +692,7 @@
* @param uid
* @param sourceType
*/
- private void fanLiShareOther(List<HongBaoV2> hongBaoList, Long uid, int sourceType, String key) {
+ private void fanLiShareOther(List<HongBaoV2> hongBaoList, Long uid, int sourceType, String key,Date recieveMonth) {
BigDecimal sharemoney = new BigDecimal(0);
List<Long> hbIdList = new ArrayList<>();
List<Long> recieveHongBaoIds = new ArrayList<>();
@@ -716,7 +728,7 @@
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, sharemoney,
- new Date());
+ recieveMonth);
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
--
Gitblit v1.8.0