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

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

                  redPackWinInviteService.inviteSucceedReward(orderMQMsg.getUid());

               } catch (Exception e) {

                  e.printStackTrace();

                  LogHelper.errorDetailInfo(e);

                  return Action.ReconsumeLater;

               }

            }

            return Action.CommitMessage;

@@ -121,9 +122,10 @@
                  UserInviteMQMsg.class);

            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()),

                  UserRedPackGiftMQMsg.class);