From bef0ef19d792a16a31a59ec7beafc7b0885529fa Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 06 十一月 2019 15:36:31 +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/consumer/order/BanLiShopOrderMessageListener.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java
index 7fdfd49..03c6692 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/order/BanLiShopOrderMessageListener.java
@@ -12,7 +12,10 @@
import com.yeshi.fanli.dto.mq.BaseMQMsgBody;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;
+import com.yeshi.fanli.entity.shop.BanLiShopOrder;
+import com.yeshi.fanli.exception.shop.BanLiShopOrderException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.shop.BanLiShopOrderPayService;
import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
@@ -29,15 +32,23 @@
@Resource
private BanLiShopOrderService banLiShopOrderService;
+ @Resource
+ private BanLiShopOrderPayService banLiShopOrderPayService;
+
public BanLiShopOrderMessageListener() {
}
@Override
public Action consume(Message message, ConsumeContext context) {
- BaseMQMsgBody baseBody = new Gson().fromJson(new String(message.getBody()), BaseMQMsgBody.class);
- if (baseBody.isTest() != Constant.IS_TEST)
- return Action.ReconsumeLater;
+ BaseMQMsgBody baseBody = null;
+ try {
+ baseBody = new Gson().fromJson(new String(message.getBody()), BaseMQMsgBody.class);
+ if (baseBody.isTest() != Constant.IS_TEST)
+ return Action.ReconsumeLater;
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
LogHelper.mqInfo("consumer:BanLiShopOrderMessageListener", message.getTopic(), message.getTag(),
new String(message.getBody()));
String tag = message.getTag();
@@ -50,7 +61,27 @@
// 浣胯鍗曞け鏁�
banLiShopOrderService.invalidOrderByOrderId(banLiShopOrderMQMsg.getOrderId(), "璁㈠崟澶辨晥-闀挎湡鏈粯娆�");
return Action.CommitMessage;
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.banLiShopOrderPaid.name()))// 鍟嗗煄璁㈠崟浠樻鎴愬姛
+ {
+ BanLiShopOrderMQMsg msg = new Gson().fromJson(new String(message.getBody()), BanLiShopOrderMQMsg.class);
+ BanLiShopOrder banLiOrder = banLiShopOrderService.selectByPrimaryKey(msg.getOrderId());
+ try {
+ banLiShopOrderPayService.payOrderByMoney(banLiOrder.getId(), banLiOrder.getMoneyPayment());
+ } catch (BanLiShopOrderException e) {
+ e.printStackTrace();
+ }
+ return Action.CommitMessage;
+ } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.banLiShopOrderRefund.name()))// 鍟嗗煄閫�娆捐闃�
+ {
+ BanLiShopOrderMQMsg msg = new Gson().fromJson(new String(message.getBody()), BanLiShopOrderMQMsg.class);
+ try {
+ banLiShopOrderPayService.refund(msg.getOrderId());
+ } catch (BanLiShopOrderException e) {
+ e.printStackTrace();
+ }
+ return Action.CommitMessage;
}
+
}
return Action.CommitMessage;
}
--
Gitblit v1.8.0