Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/util/rocketmq/consumer/redpack/RedPackMessageListener.java

@@ -14,7 +14,6 @@
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.IntegralTaskMQMsg;

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;

@@ -56,28 +55,8 @@
         tag = "";



      if (MQTopicName.TOPIC_ORDER.name().equalsIgnoreCase(message.getTopic())) {

         if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderFanLiActual.name())) {// 返利到账

            OrderMoneyRecievedMQMsg orderMoneyRecievedMQMsg = new Gson().fromJson(new String(message.getBody()),

                  OrderMoneyRecievedMQMsg.class);

            // 分享订单奖励

            if (orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {

               // try {

               // redPackWinInviteService.orderArriveReward(orderMoneyRecievedMQMsg.getUid(),

               // orderMoneyRecievedMQMsg.getSourceType(),

               // orderMoneyRecievedMQMsg.getOrderId());

               // } catch (Exception e) {

               // e.printStackTrace();

               // }

            }

         } else if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 订单统计

         if (tag.equalsIgnoreCase(OrderTopicTagEnum.orderStatistic.name())) {// 订单统计

            OrderMQMsg orderMQMsg = new Gson().fromJson(new String(message.getBody()), OrderMQMsg.class);

            if (orderMQMsg.isValid()) {

               try {// 邀请奖励

                  redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

               } catch (Exception e) {

                  e.printStackTrace();

               }

            }

            // 发送24小时延时消息

            // 测试时发送

            int hour = 24;

@@ -93,31 +72,39 @@
               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;

         }



         if (orderMQMsg.getDelayHour() == hour) {

            // TODO 处理延时消息

         }

         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_ZIGOU

               || orderMoneyRecievedMQMsg.getType() == OrderMoneyRecievedMQMsg.TYPE_SHARE) {

            if (!StringUtil.isNullOrEmpty(orderMoneyRecievedMQMsg.getOrderId())

                  && orderMoneyRecievedMQMsg.getUid() != null) {

               // TODO 自购与分享订单到账处理

         } 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;

            }

         }



         return Action.CommitMessage;

            if (orderMQMsg.getDelayHour() == hour) {

               try {// 邀请奖励

                  redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

               } catch (Exception e) {

                  LogHelper.errorDetailInfo(e);

                  return Action.ReconsumeLater;

               }

            }

            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;

@@ -125,7 +112,8 @@
            UserAccountBindingMQMsg userAccountBindingMQMsg = new Gson().fromJson(new String(message.getBody()),

                  UserAccountBindingMQMsg.class);

            Integer type = userAccountBindingMQMsg.getType();

            if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {

            if (type == UserAccountBindingMQMsg.TYPE_PHONE || type == UserAccountBindingMQMsg.TYPE_WX

                  || type == UserAccountBindingMQMsg.TYPE_TAOBAO) {

               inviteSucceedReward = true;

               uid = userAccountBindingMQMsg.getUid();

            }

@@ -134,16 +122,14 @@
                  UserInviteMQMsg.class);

            inviteSucceedReward = true;

            uid = userInviteMQMsg.getWorkerId();

         } else if (tag.equalsIgnoreCase(UserTopicTagEnum.integralTaskFinish.name())) {// 金币任务完成

            IntegralTaskMQMsg integralTaskMQMsg = new Gson().fromJson(new String(message.getBody()),

                  IntegralTaskMQMsg.class);

            inviteSucceedReward = true;

            uid = integralTaskMQMsg.getUid();



            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 {

            try { // 红包赠送到期未领取

               redPackGiveRecordService.overdueByPrimaryKey(userRedPackGiftMQMsg.getId());

            } catch (Exception e) {

               e.printStackTrace();

@@ -153,15 +139,11 @@


         if (inviteSucceedReward) {

            try {// 邀请奖励

               if (uid == 6269748) {

                  System.out.println(uid);

               }

               // redPackWinInviteService.inviteSucceedReward(uid);

               redPackWinInviteService.inviteSucceedReward(uid);

            } catch (Exception e) {

               e.printStackTrace();

            }

         }



      }

      return Action.CommitMessage;

   }