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

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java

@@ -14,23 +14,22 @@
 * @author Administrator

 *

 */

@Table("yeshi_red_pack_detail")

@Table("yeshi_ec_red_pack_detail")

public class RedPackDetail {

   public enum RedPackDetailTypeEnum {

      refund("红包退回", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

      deduct("红包涉嫌违规", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

      forbid("涉嫌恶意机刷红包", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

      newUserReward("新人奖励", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 

      invite("立得现金", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 

      increaseReward("递增奖励", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 

      seriesReward("连续奖励", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 

      refund("红包退回", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      videoRecharge("视频会员充值", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      musicRecharge("音乐会员充值", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      violation("红包涉嫌违规", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

		
      giveOthers("红包赠送待领取中", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      giveOthersSucceed("红包赠送领取成功", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      giveOthersFail("红包赠送超时退回", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
      giveOthersReceive("好友赠送", "http://img.flqapp.com/img/tlj/icon_tlj.png"), 
		
      giveOthers("红包赠送待领取中", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"), 
      giveOthersSucceed("红包赠送领取成功", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"), 
      giveOthersFail("红包赠送超时退回", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"), 
      giveOthersReceive("好友赠送", "http://img.flqapp.com/resource/msg/icon_hongbao_give.png"), 
      useByShopOrder("商城订单使用", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

      shopOrderDrawBack("商城订单退回", "http://img.flqapp.com/img/tlj/icon_tlj.png"),

      redExchange("红包提现中", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),

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

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

@@ -46,7 +45,7 @@
      public String getDesc() {

         return desc;

      }

		


      public String getPicture() {

         return picture;

      }

@@ -71,8 +70,8 @@
   @Column(name = "rpd_type")

   private RedPackDetailTypeEnum type;

   @Expose

   @Column(name = "rpd_desc")

   private String desc;

   @Column(name = "rpd_desc_info")

   private String descInfo;

   @Expose

   @Column(name = "rpd_remark")

   private String remark;

@@ -83,6 +82,8 @@
   @Column(name = "rpd_display")

   private Boolean display;



   private BigDecimal balance;

	
   public Long getId() {

      return id;

   }

@@ -123,12 +124,12 @@
      this.type = type;

   }



   public String getDesc() {

      return desc;

   public String getDescInfo() {

      return descInfo;

   }



   public void setDesc(String desc) {

      this.desc = desc;

   public void setDescInfo(String descInfo) {

      this.descInfo = descInfo;

   }



   public String getRemark() {

@@ -162,4 +163,12 @@
   public void setDisplay(Boolean display) {

      this.display = display;

   }



   public BigDecimal getBalance() {

      return balance;

   }



   public void setBalance(BigDecimal balance) {

      this.balance = balance;

   }

}