From ec60e757d358636dcac1589c44a66f3e276fe58c Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 29 六月 2020 14:41:42 +0800
Subject: [PATCH] 拉新

---
 fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java |   48 ++++++++++++++++++++++++++++++------------------
 1 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
index fc80c7c..ac1ab85 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/redpack/RedPackDetail.java
@@ -14,24 +14,26 @@
  * @author Administrator
  *
  */
-@Table("yeshi_red_pack_detail")
+@Table("yeshi_ec_red_pack_detail")
 public class RedPackDetail {
 	public enum RedPackDetailTypeEnum {
-		invite("绔嬪緱鐜伴噾", "http://img.flqapp.com/img/tlj/icon_tlj.png"),
-		newUserReward("鏂颁汉濂栧姳", "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"),
+		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"), 
+		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"),
-		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"),
-
+		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");
+		redExchangeReject("绾㈠寘鎻愮幇澶辫触", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png"),
+		redMonthly("鏈堢粨绾㈠寘", "http://img.flqapp.com/img/tlj/icon_tlj.png");
 
 		private final String desc;
 		private final String picture;
@@ -69,8 +71,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;
@@ -81,6 +83,8 @@
 	@Column(name = "rpd_display")
 	private Boolean display;
 
+	private BigDecimal balance;
+	
 	public Long getId() {
 		return id;
 	}
@@ -121,12 +125,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() {
@@ -160,4 +164,12 @@
 	public void setDisplay(Boolean display) {
 		this.display = display;
 	}
+
+	public BigDecimal getBalance() {
+		return balance;
+	}
+
+	public void setBalance(BigDecimal balance) {
+		this.balance = balance;
+	}
 }

--
Gitblit v1.8.0