From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 c7b3011..e6fe708 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
@@ -52,11 +52,12 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.OrderMoneySettleService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
import com.yeshi.fanli.service.manger.order.TeamRewardManager;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.mq.cmq.HongBaoRecieveCMQManager;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -106,6 +107,9 @@
@Resource
private TeamRewardManager teamRewardManager;
+
+ @Resource
+ private RocketMQManager rocketMQManager;
// 涓嬬骇琚皝绂侊紝绾㈠寘澶辨晥
private void invalidHongBaoForbidden(Long id) {
@@ -155,6 +159,9 @@
}
}
}
+
+ if(hongBaoList.size()==0)
+ return;
String taskKey = getTaskKey(uid);
@@ -164,6 +171,8 @@
Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.teamRewardPreRecieved, mqMsg);
msg.setKey(taskKey);
+
+
// 娣诲姞浜嬪姟娑堟伅
try {
orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@@ -178,6 +187,20 @@
return TransactionStatus.CommitTransaction;
}
}, null);
+
+// rocketMQManager.sendTransactionalMsg(msg, taskKey, new RocketMQManager.ITransactionalMQEvent() {
+// @Override
+// public TransactionStatus excute(Message arg0, Object arg1) {
+// try {
+// fanliInvite(hongBaoList, uid, Constant.SOURCE_TYPE_TAOBAO, taskKey, maxPregetTime);
+// } catch (Exception e) {
+// e.printStackTrace();
+// return TransactionStatus.RollbackTransaction;
+// }
+// return TransactionStatus.CommitTransaction;
+// }
+// });
+
} catch (Exception e) {
e.printStackTrace();
LogHelper.mqError(e.getMessage(), msg.getTopic(), msg.getTag(), new Gson().toJson(mqMsg));
@@ -224,6 +247,9 @@
}
}
}
+
+ if(hongBaoList.size()==0)
+ return;
// 閭�璇疯禋鍒拌处浜嬪姟娑堟伅
@@ -290,6 +316,9 @@
}
}
}
+
+ if(hongBaoList.size()==0)
+ return;
// 閭�璇疯禋鍒拌处浜嬪姟娑堟伅
String taskKey = getTaskKey(uid);
@@ -354,6 +383,9 @@
}
}
}
+
+ if(hongBaoList.size()==0)
+ return;
// 閭�璇疯禋鍒拌处浜嬪姟娑堟伅
String taskKey = getTaskKey(uid);
@@ -630,7 +662,7 @@
}
// 閫氱煡鍏嶅崟鍒拌处
try {
- userSystemCouponService.updateStateByArrivalAccount(orderId);
+ userSystemCouponService.updateStateByArrivalAccount(orderId,sourceType);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0