Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-25 59aced4fe04f7e2fdcca81cb9ef279a70522301e

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

@@ -83,7 +83,8 @@
               try {// 邀请奖励

                  redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

               } catch (Exception e) {

                  e.printStackTrace();

                  LogHelper.errorDetailInfo(e);

                  return Action.ReconsumeLater;

               }

            }

            return Action.CommitMessage;

@@ -122,7 +123,8 @@
            inviteSucceedReward = true;

            uid = userInviteMQMsg.getWorkerId();

            

            redPackWinInviteService.initCreateRedPackWin(userInviteMQMsg.getBossId(),userInviteMQMsg.getWorkerId());

            redPackWinInviteService.initCreateRedPackWin(userInviteMQMsg.getBossId(),

                  userInviteMQMsg.getWorkerId());

            

         } else if (tag.equalsIgnoreCase(UserTopicTagEnum.redPackGiftDrawback.name())) {// 红包赠送

            UserRedPackGiftMQMsg userRedPackGiftMQMsg = new Gson().fromJson(new String(message.getBody()),