From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalUserCouponUsedTransactionChecker.java | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalUserCouponUsedTransactionChecker.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalUserCouponUsedTransactionChecker.java
index 3df94c6..7c37be1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalUserCouponUsedTransactionChecker.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/order/MQLocalUserCouponUsedTransactionChecker.java
@@ -7,7 +7,8 @@
import com.aliyun.openservices.ons.api.Message;
import com.aliyun.openservices.ons.api.transaction.TransactionStatus;
import com.google.gson.Gson;
-import com.yeshi.fanli.dto.user.coupon.UserSystemCouponUseMQMsgDTO;
+import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
+import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
@@ -29,20 +30,23 @@
}
public TransactionStatus check(Message msg) {
- if (msg.getTopic().equalsIgnoreCase(MQTopicName.TOPIC_SYSTEM_COUPON_USE.name())) {
- if (msg.getTag().equalsIgnoreCase(SystemCoupon.CouponTypeEnum.rebatePercentCoupon.name())) {// 杩斿埄濂栧姳鍒�
+ if (msg.getTopic().equalsIgnoreCase(MQTopicName.TOPIC_USER.name())) {
+ if (msg.getTag().equalsIgnoreCase(UserTopicTagEnum.useSystemCoupon.name())) {// 杩斿埄濂栧姳鍒�
// 鏌ヨ鏄惁浣跨敤鎴愬姛
- UserSystemCouponUseMQMsgDTO dto = new Gson().fromJson(new String(msg.getBody()),
- UserSystemCouponUseMQMsgDTO.class);
- UserSystemCouponRecord record = userSystemCouponRecordService
- .getNearByUserCouponId(dto.getUserSystemCouponId());
- if (record != null) {
- if (record.getOrderNo().equalsIgnoreCase(dto.getOrderId())
- && dto.getSourceType().intValue() == record.getGoodSource()) {
- return TransactionStatus.CommitTransaction;
+ UserSystemCouponUseMQMsg dto = new Gson().fromJson(new String(msg.getBody()),
+ UserSystemCouponUseMQMsg.class);
+
+ if (SystemCoupon.CouponTypeEnum.rebatePercentCoupon.name().equalsIgnoreCase(dto.getCouponType())) {
+ UserSystemCouponRecord record = userSystemCouponRecordService
+ .getNearByUserCouponId(dto.getUserSystemCouponId());
+ if (record != null) {
+ if (record.getOrderNo().equalsIgnoreCase(dto.getOrderId())
+ && dto.getSourceType().intValue() == record.getGoodSource()) {
+ return TransactionStatus.CommitTransaction;
+ }
}
+ return TransactionStatus.RollbackTransaction;
}
- return TransactionStatus.RollbackTransaction;
}
}
return TransactionStatus.Unknow;
--
Gitblit v1.8.0