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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java

@@ -19,42 +19,48 @@
@Table("yeshi_ec_msg_money")

public class MsgMoneyDetail {

   public enum MsgTypeMoneyTypeEnum {

      share("分享奖金"),

      invite("团队奖金"),

      fanli("返利到账"),

      extract("提现"),

      extractAutoWX("自动提现"),

      extractValid("提现账号验证"),

      shareWeiQuan("分享奖金扣除"),

      inviteWeiQuan("团队奖金扣除"),

      fanliWeiQuan("返利扣除"),

      orderReward("返利奖励"),

      systemEqualize("系统补齐"),

      fanliElme("返利到账"),

      subSidy("额外补贴"),

      redPackGiveOff("赠送红包完成"),

      redPackReceiveOff("赠送红包领取"),

      redPackGiveBack("红包退回"),

      redPackExchangePass("红包提现成功"),

      redPackExchangeReject("红包提现失败"),

      redPackOneStageReward("第一阶段-立得现金-成功邀请好友"),

      redPackTwoStageReward("第二阶段-递增奖励-好友完成订单"),

      redPackThreeStageReward("第三阶段-连续奖励-好友完成订单"),

      redPackUseSuccess("红包使用成功"),

      redPackUseFail("红包使用失败"),

      redPackForbid("红包封禁"),

      redPackForbidRemove("红包解封"),

      redPackDeduct("红包扣除"),

      orderTeamReward("团队奖励");

      fanli("资金到账", "http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),

      share("资金到账", "http://img.flqapp.com/resource/msg/icon_msg_share_money.png"),

      invite("资金到账", "http://img.flqapp.com/resource/msg/icon_msg_invite_money.png"),

      extract("提现", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),

      fanliWeiQuan("资金退回","http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),

      shareWeiQuan("资金退回", "http://img.flqapp.com/resource/msg/icon_msg_share_money.png"),

      extractAutoWX("自动提现", "http://img.flqapp.com/resource/money_detail/icon_system.png"),

      extractValid("提现账号验证", "http://img.flqapp.com/resource/msg/icon_msg_extract.png"),

      inviteWeiQuan("团队奖金扣除", "http://img.flqapp.com/resource/msg/icon_msg_invite_money.png"),

      orderReward("返利奖励","http://img.flqapp.com/resource/msg/icon_msg_order_reward.png"),

      systemEqualize("系统补齐","http://img.flqapp.com/resource/money_detail/icon_system.png"),

      fanliElme("返利到账", "http://img.flqapp.com/resource/msg/icon_msg_fanli.png"),

      subSidy("额外补贴", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png"),

      redPackGiveOff("赠送红包完成", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),

      redPackReceiveOff("赠送红包领取","http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),

      redPackGiveBack("红包退回", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"),

      redPackExchangePass("红包提现成功", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),

      redPackExchangeReject("红包提现失败", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),

      redPackOneStageReward("第一阶段-立得现金-成功邀请好友","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackTwoStageReward("第二阶段-递增奖励-好友完成订单","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackThreeStageReward("第三阶段-连续奖励-好友完成订单","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackUseSuccess("红包使用成功","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackUseFail("红包使用失败","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackForbid("红包封禁","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackForbidRemove("红包解封","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redPackDeduct("红包扣除","http://img.flqapp.com/img/tlj/icon_tlj.png"),

      orderTeamReward("团队奖励","http://img.flqapp.com/resource/msg/icon_msg_team_reward.png");



      private final String desc;

      private final String icon;



      private MsgTypeMoneyTypeEnum(String desc) {

      private MsgTypeMoneyTypeEnum(String desc, String icon) {

         this.desc = desc;

         this.icon = icon;

      }



      public String getDesc() {

         return desc;

      }

		
      public String getIcon() {

         return icon;

      }

   }



@@ -93,6 +99,9 @@
   private Boolean read;

   @Column(name = "mm_content") // 消息内容

   private String content;

	
   private String extraInfo;// 新版消息内容

	


   public Long getId() {

      return id;

@@ -237,4 +246,12 @@
   public void setContent(String content) {

      this.content = content;

   }



   public String getExtraInfo() {

      return extraInfo;

   }



   public void setExtraInfo(String extraInfo) {

      this.extraInfo = extraInfo;

   }

}