From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java | 156 +++++++++++++--------------------------------------
1 files changed, 41 insertions(+), 115 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
index 844dc7d..b47fc04 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java
@@ -2,6 +2,10 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
import org.springframework.stereotype.Component;
import com.aliyun.openservices.ons.api.Action;
@@ -11,138 +15,60 @@
import com.aliyun.openservices.ons.api.Producer;
import com.google.gson.Gson;
import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;
-import com.yeshi.fanli.dto.mq.order.body.OrderMQMsg;
-import com.yeshi.fanli.dto.mq.order.body.OrderMoneyRecievedMQMsg;
-import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
-import com.yeshi.fanli.dto.mq.user.body.UserAccountBindingMQMsg;
-import com.yeshi.fanli.dto.mq.user.body.UserInviteMQMsg;
-import com.yeshi.fanli.dto.mq.user.body.UserRedPackGiftMQMsg;
+import com.yeshi.fanli.dto.mq.order.body.OrderConfirmMQMsg;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.redpack.RedPackGiveRecordService;
import com.yeshi.fanli.service.inter.redpack.RedPackWinInviteService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
/**
* 绾㈠寘娑堣垂
- *
- * @author Administrator
*
+ * @author Administrator
*/
@Component
public class RedPackMessageListener implements MessageListener {
- @Resource
- private UserSystemCouponService userSystemCouponService;
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
- @Resource
- private RedPackWinInviteService redPackWinInviteService;
+ @Resource
+ private RedPackWinInviteService redPackWinInviteService;
- @Resource
- private RedPackGiveRecordService redPackGiveRecordService;
+ @Resource
+ private RedPackGiveRecordService redPackGiveRecordService;
- @Resource(name = "producer")
- private Producer producer;
+ @Resource
+ private RocketMQManager rocketMQManager;
- @Override
- public Action consume(Message message, ConsumeContext context) {
- LogHelper.mqInfo("consumer-RedPackMessageListener", message.getMsgID(), message.getTopic(), message.getTag(),
- new String(message.getBody()));
- String tag = message.getTag();
- if (tag == null)
- tag = "";
+ @Resource
+ private UserInfoService userInfoService;
- if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
- if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 璁㈠崟缁熻
- OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- // 鍙戦��24灏忔椂寤舵椂娑堟伅
- // 娴嬭瘯鏃跺彂閫�
- int hour = 24;
- if (Constant.IS_TEST) {
- hour = 1;
- }
- orderMQMsg.setDelayHour(hour);
- Message msg = new Message(message.getTopic(), OrderTopicTagEnum.orderStatisticDelay.name(),
- new Gson().toJson(orderMQMsg).getBytes());
- if (orderMQMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour > System.currentTimeMillis())// 鏃堕棿鏄惁宸茬粡杩囦簡
- msg.setStartDeliverTime(orderMQMsg.getStaticticDate().getTime() + 1000 * 60 * 60L * hour);
- else
- msg.setStartDeliverTime(System.currentTimeMillis() + 1000 * 60);
- producer.send(msg);
- return Action.CommitMessage;
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatisticDelay.name())) {// 璁㈠崟缁熻
- OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);
- int hour = 24;
- if (Constant.IS_TEST) {
- hour = 1;
- }
+ @Override
+ public Action consume(Message message, ConsumeContext context) {
+ LogHelper.mqInfo("consumer-RedPackMessageListener", message.getMsgID(), message.getTopic(), message.getTag(),
+ new String(message.getBody()));
+ String tag = message.getTag();
+ if (tag == null)
+ tag = "";
- if (orderMQMsg.getDelayHour() == hour) {
- try {// 閭�璇峰鍔�
- redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- return Action.CommitMessage;
- } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiSeparateByOrderNo.name())) {// 璁㈠崟鍒拌处锛堟寜璁㈠崟鍙峰鐞嗭級
- OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsg = new Gson().fromJson(new String(message.getBody()),
- OrderMoneyRecievedMQMsg.class);
-
- if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_INVITE) {
- if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())
- && orderMoneyRecievedMQMsg.getUid() != null) {
- try {
- redPackWinInviteService.inviteOrderArriveReward(orderMoneyRecievedMQMsg.getUid(),
- orderMoneyRecievedMQMsg.getSourceType(), orderMoneyRecievedMQMsg.getOrderId());
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- return Action.CommitMessage;
- }
- } else if (MQTopicName.TOPIC_USER.name().equalsIgnoreCase(message.getTopic())) {
- boolean inviteSucceedReward = false;
- Long uid = null;
- if (tag.equalsIgnoreCase(UserTopicTagEnum.userAccountBinding.name())) {// 璐﹀彿缁戝畾
- UserAccountBindingMQMsg userAccountBindingMQMsg = new Gson().fromJson(new String(message.getBody()),
- UserAccountBindingMQMsg.class);
- Integer type = userAccountBindingMQMsg.getType();
- if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_WX
- || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {
- inviteSucceedReward = true;
- uid = userAccountBindingMQMsg.getUid();
- }
- } else if (tag.equalsIgnoreCase(UserTopicTagEnum.inviteSuccess.name())) {// 閭�璇锋垚鍔�
- UserInviteMQMsg userInviteMQMsg = new Gson().fromJson(new String(message.getBody()),
- UserInviteMQMsg.class);
- inviteSucceedReward = true;
- uid = userInviteMQMsg.getWorkerId();
-
- redPackWinInviteService.initCreateRedPackWin(userInviteMQMsg.getBossId(),userInviteMQMsg.getWorkerId());
-
- } else if (tag.equalsIgnoreCase(UserTopicTagEnum.redPackGiftDrawback.name())) {// 绾㈠寘璧犻��
- UserRedPackGiftMQMsg userRedPackGiftMQMsg = new Gson().fromJson(new String(message.getBody()),
- UserRedPackGiftMQMsg.class);
- try { // 绾㈠寘璧犻�佸埌鏈熸湭棰嗗彇
- redPackGiveRecordService.overdueByPrimaryKey(userRedPackGiftMQMsg.getId());
- } catch (Exception e) {
- e.printStackTrace();
- }
- return Action.CommitMessage;
- }
-
- if (inviteSucceedReward) {
- try {// 閭�璇峰鍔�
- redPackWinInviteService.inviteSucceedReward(uid);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- }
- return Action.CommitMessage;
- }
+ if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {
+ // 璁㈠崟纭鏀惰揣
+ if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderConfirm.name())) {
+ OrderConfirmMQMsg mqMsg = new Gson().fromJson(new String(message.getBody()), OrderConfirmMQMsg.class);
+ //鍒ゆ柇绯荤粺鏄惁鍖呭惈绾㈠寘鍔熻兘
+ Long sourceUid = mqMsg.getSourceUid();
+ SystemEnum system = userInfoService.getUserSystem(sourceUid);
+ if (!system.getFunctionSet().contains(SystemFunction.redPack))
+ return Action.CommitMessage;
+ try {// 閭�璇峰鍔�
+ redPackWinInviteService.winRedPackByOrder(mqMsg.getSourceUid(), mqMsg.getOrderNo(), mqMsg.getSourceType());
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
+ return Action.CommitMessage;
+ }
}
--
Gitblit v1.8.0