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,16 +19,48 @@
@Table("yeshi_ec_msg_money")

public class MsgMoneyDetail {

   public enum MsgTypeMoneyTypeEnum {

      share("分享奖金"), invite("邀请奖金"), fanli("返利到账"), extract("提现"), extractValid("提现账号验证"), shareWeiQuan(

            "分享奖金扣除"), inviteWeiQuan("邀请奖金扣除"), fanliWeiQuan("返利扣除"),orderReward("奖励订单");

      private final String desc;

      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 MsgTypeMoneyTypeEnum(String desc) {

      private final String desc;

      private final String icon;



      private MsgTypeMoneyTypeEnum(String desc, String icon) {

         this.desc = desc;

         this.icon = icon;

      }



      public String getDesc() {

         return desc;

      }

		
      public String getIcon() {

         return icon;

      }

   }



@@ -44,6 +76,8 @@
   private Integer goodsCount;// 商品数

   @Column(name = "mm_order_id")

   private String orderId;// 订单号（返利适用）

   @Column(name = "mm_order_type")

   private Integer orderType;

   @Column(name = "mm_source_id")

   private Extract extract;// 提现详情

   private AlipayAccountValidNormalHistory alipayAccountValid;// 提现账号验证详情

@@ -53,6 +87,8 @@
   private BigDecimal balance;// 账户余额

   @Column(name = "mm_state_desc")

   private String stateDesc;// 状态说明

   @Column(name = "mm_desc")

   private String desc;// 说明

   @Column(name = "mm_beizhu")

   private String beiZhu;// 备注

   @Column(name = "mm_create_time")

@@ -61,6 +97,11 @@
   private Date updateTime;

   @Column(name = "mm_read")

   private Boolean read;

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

   private String content;

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

	


   public Long getId() {

      return id;

@@ -182,4 +223,35 @@
      this.alipayAccountValid = alipayAccountValid;

   }



   public Integer getOrderType() {

      return orderType;

   }



   public void setOrderType(Integer orderType) {

      this.orderType = orderType;

   }



   public String getDesc() {

      return desc;

   }



   public void setDesc(String desc) {

      this.desc = desc;

   }



   public String getContent() {

      return content;

   }



   public void setContent(String content) {

      this.content = content;

   }



   public String getExtraInfo() {

      return extraInfo;

   }



   public void setExtraInfo(String extraInfo) {

      this.extraInfo = extraInfo;

   }

}