From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
index b2edef1..c234c99 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java
@@ -18,13 +18,20 @@
@Table("yeshi_ec_user_money_detail")
public class UserMoneyDetail {
+ public UserMoneyDetail(Long id) {
+ this.id = id;
+ }
+
+ public UserMoneyDetail() {
+ }
+
public enum UserMoneyDetailTypeEnum {
- share("鍒嗕韩濂栭噾", "", ""), invite("閭�璇峰閲�", "", ""), inviteAndShare("濂栭噾鏀跺叆", "", ""), fanli("杩斿埄鍒拌处", "",
- ""), fanliWeiQuan("杩斿埄鎵ｉ櫎", "", ""), inviteWeiQuan("閭�璇峰閲戞墸闄�", "", ""), shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "",
- ""), weiQuan("鍞悗璁㈠崟鎵ｆ", "", ""), systemEqualize("绯荤粺琛ラ綈", "", ""), scoreConvert("绉垎鍏戞崲", "",
- ""), hongbao("瀹樻柟绾㈠寘", "", ""), hongbaoDeduct("绾㈠寘閫�娆�", "", ""), buyScore("璐拱绉垎", "",
- ""), extract("鎻愮幇", "",
- ""), extractVerify("鎻愮幇楠岃瘉", "", ""), extractReject("鎻愮幇琚嫆", "", "");
+ share("鍒嗕韩濂栭噾", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), invite("閭�璇峰閲�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", ""), inviteAndShare("濂栭噾鏀跺叆", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""), fanli("杩斿埄鍒拌处", "http://img.flqapp.com/resource/money_detail/icon_fanli.png",
+ ""), fanliWeiQuan("杩斿埄鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), inviteWeiQuan("閭�璇峰閲戞墸闄�", "http://img.flqapp.com/resource/money_detail/icon_invite.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_share.png",
+ "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), weiQuan("鍞悗璁㈠崟鎵ｆ", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", "http://apph5.yeshitv.com/apppage/flq_whyMoneyDel.html"), systemEqualize("绯荤粺琛ラ綈", "http://img.flqapp.com/resource/money_detail/icon_system.png", ""), scoreConvert("绉垎鍏戞崲", "http://img.flqapp.com/resource/money_detail/icon_score.png",
+ ""), hongbao("瀹樻柟绾㈠寘", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png", ""), hongbaoDeduct("绾㈠寘閫�娆�", "http://img.flqapp.com/resource/money_detail/icon_hongbao.png",
+ ""), buyScore("璐拱绉垎", "http://img.flqapp.com/resource/money_detail/icon_score.png", ""), extract("鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png",
+ ""), extractVerify("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""), extractReject("鎻愮幇琚嫆", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),orderReward("杩斿埄濂栧姳","http://img.flqapp.com/resource/money_detail/icon_order_reward.png",""),repeatStatistic("閲嶅缁熻杩斿埄/濂栭噾鎵ｉ櫎","http://img.flqapp.com/resource/money_detail/icon_fanli.png","");
private final String desc;
private final String picture;
private final String helpUrl;
@@ -56,6 +63,7 @@
@Expose
@Column(name = "umd_money")
private BigDecimal money;
+ @Expose
@Column(name = "umd_type")
private UserMoneyDetailTypeEnum type;
@Expose
@@ -78,6 +86,16 @@
private Date createTime;
@Column(name = "umd_updatetime")
private Date updateTime;
+
+ private Integer state;//鑰佺増鏄庣粏閫傜敤璇ュ瓧娈�
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
public Long getId() {
return id;
@@ -175,4 +193,5 @@
this.updateTime = updateTime;
}
+
}
--
Gitblit v1.8.0