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

admin

2019-11-13 221b5c8d0de3f6b17a00d543503a79c13b28ba12

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackWinInviteServiceImpl.java

@@ -181,7 +181,8 @@
      dto.setTitle("红包增加");

      dto.setMoney("¥" + money.setScale(2));

      dto.setBalance("¥" + redPackBalanceService.getBalance(uid).setScale(2));

      userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, new Gson().toJson(dto), "红包可用于购买会员");

      userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackFirstSharedOrder, 
            new Gson().toJson(dto), "请到“我的-红包”中查看");

   }

   

   

@@ -240,7 +241,8 @@
      dto.setTitle("红包增加");

      dto.setMoney("¥" + money.setScale(2));

      dto.setBalance("¥" + redPackBalanceService.getBalance(uid).setScale(2));

      userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder, new Gson().toJson(dto), "红包可用于购买会员");

      userMoneyMsgNotificationService.redPackMsg(uid, MsgTypeMoneyTypeEnum.redPackMonthSharedOrder,

            new Gson().toJson(dto), "请到“我的-红包”中查看");

   }

   

   

@@ -321,7 +323,8 @@
         dto.setTitle("红包增加");

         dto.setMoney("¥" + money.setScale(2));

         dto.setBalance("¥" + redPackBalanceService.getBalance(boss.getId()).setScale(2));

         userMoneyMsgNotificationService.redPackMsg(boss.getId(), MsgTypeMoneyTypeEnum.redPackInviteSucceed, new Gson().toJson(dto), "红包可用于购买会员");

         userMoneyMsgNotificationService.redPackMsg(boss.getId(), MsgTypeMoneyTypeEnum.redPackInviteSucceed,

               new Gson().toJson(dto), "请到“我的-红包”中查看");

      }

   }