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 | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 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 c2e3091..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
@@ -276,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;
}
@@ -320,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);
@@ -376,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);
@@ -396,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)
@@ -599,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>();
@@ -644,7 +647,7 @@
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,
- sharemoney, new Date());
+ sharemoney,recieveMonth);
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
@@ -689,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<>();
@@ -725,7 +728,7 @@
// 娣诲姞鏂扮増璇︽儏璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, sourceType, sharemoney,
- new Date());
+ recieveMonth);
// 娣诲姞璧勯噾
userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);
--
Gitblit v1.8.0