From 28cf328a098334b51a3e9d2d56f983fb8c862211 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:54:38 +0800
Subject: [PATCH] 足迹、收藏订单兼容新需求
---
fanli/src/main/java/com/yeshi/fanli/entity/money/UserMoneyDetail.java | 151 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 137 insertions(+), 14 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 f12c68e..041e721 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
@@ -3,6 +3,10 @@
import java.math.BigDecimal;
import java.util.Date;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
+import com.google.gson.annotations.Expose;
import com.yeshi.fanli.entity.bus.user.UserInfo;
/**
@@ -11,22 +15,66 @@
* @author Administrator
*
*/
+@Table("yeshi_ec_user_money_detail")
public class UserMoneyDetail {
+ public UserMoneyDetail(Long id) {
+ this.id = id;
+ }
+
+ public UserMoneyDetail() {
+ }
+
public enum UserMoneyDetailTypeEnum {
- share("鍒嗕韩濂栭噾", "", ""),
- invite("閭�璇峰閲�", "", ""),
- fanli("杩斿埄鍒拌处", "", ""),
- fanliWeiQuan("杩斿埄鎵ｉ櫎", "",""),
- inviteWeiQuan("閭�璇峰閲戞墸闄�", "", ""),
- shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎", "", ""),
- systemEqualize("绯荤粺琛ラ綈", "",""),
- scoreConvert("绉垎鍏戞崲", "", ""),
- hongbao("瀹樻柟绾㈠寘", "", ""),
- 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.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ inviteWeiQuan("鍥㈤槦濂栭噾鎵ｉ櫎",
+ "http://img.flqapp.com/resource/money_detail/icon_invite.png",
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎",
+ "http://img.flqapp.com/resource/money_detail/icon_share.png",
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ weiQuan("鍞悗璁㈠崟鎵ｆ",
+ "http://img.flqapp.com/resource/money_detail/icon_fanli.png",
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ 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", ""),
+ elmeFanli("楗夸簡涔堣繑鍒╁埌璐�", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", ""),
+ redPackExchange("绾㈠寘鎻愮幇鍒颁綑棰�", "http://img.flqapp.com/resource/msg/icon_hongbao_tixian.png", ""),
+ extractAutoWX("鑷姩鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ extractAutoWXRefund("鑷姩鎻愮幇澶辫触", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ subsidy("棰濆琛ヨ创", "http://img.flqapp.com/resource/msg/icon_msg_subsidy.png", ""),
+
+
+ teamReward("鍥㈤槦鏀剁泭", "http://img.flqapp.com/resource/money_detail/icon_team_income.png", ""),
+ teamDividents("鍥㈤槦鍒嗙孩", "http://img.flqapp.com/resource/money_detail/icon_team_dividents.png", ""),
+ fanliNew("鑷喘杩斿埄", "http://img.flqapp.com/resource/money_detail/icon_fanli.png", ""),
+ orderRewardNew("杩斿埄鍐嶈繑", "http://img.flqapp.com/resource/money_detail/icon_order_reward.png", ""),
+ shareNew("鍒嗕韩濂栭噾", "http://img.flqapp.com/resource/money_detail/icon_share.png", ""),
+ systemEqualizeNew("绯荤粺琛ラ綈", "http://img.flqapp.com/resource/money_detail/icon_system.png", ""),
+ fanliWeiQuanNew("杩斿埄閫�鍥�",
+ "http://img.flqapp.com/resource/money_detail/icon_fanli.png",
+ "http://apph5.banliapp.com/AppPage/1.8.0/all_help_content.html?id=214"),
+ extractNew("鎻愮幇", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ extractVerifyNew("鎻愮幇楠岃瘉", "http://img.flqapp.com/resource/money_detail/icon_extract.png", ""),
+ systemTakeOff("绯荤粺鎵ｉ櫎", "http://img.flqapp.com/resource/money_detail/icon_extract.png", "");
+
+
+
private final String desc;
private final String picture;
private final String helpUrl;
@@ -50,90 +98,165 @@
}
}
+ @Expose
+ @Column(name = "umd_id")
private Long id;
+ @Column(name = "umd_uid")
private UserInfo userInfo;
+ @Expose
+ @Column(name = "umd_money")
private BigDecimal money;
+ @Expose
+ @Column(name = "umd_type")
private UserMoneyDetailTypeEnum type;
+
+ @Column(name = "umd_order_type")
+ private Integer orderType;// 鍜岃鍗曠浉鍏虫暟鎹墠澶勭悊
+
+ @Expose
+ @Column(name = "umd_title")
private String title;// 鏍囬
+ @Expose
+ @Column(name = "umd_sub_title")
private String subTitle;// 瀛愭爣棰�
+ @Expose
+ @Column(name = "umd_desc_info")
private String descInfo;// 绠�瑕佷俊鎭�
+ @Column(name = "umd_source_identify_id")
private Long sourceIdentifyId;// 鏉ユ簮鏂瑰敮涓�鏍囪瘑ID锛堣繑鍒╋紝閭�璇疯禋涓庡垎浜禋涓嶅瓨鍦ㄨ灞炴�э級
+ @Column(name = "umd_identify_code")
private String identifyCode;// 鍞竴鏍囪瘑
+ @Column(name = "umd_beizhu")
private String beiZhu;// 澶囨敞淇℃伅
+ @Expose
+ @Column(name = "umd_createtime")
private Date createTime;
+ @Column(name = "umd_updatetime")
private Date updateTime;
-
+
+ private Integer state;// 鑰佺増鏄庣粏閫傜敤璇ュ瓧娈�
+
+ @Column(name = "umd_show")
+ private Boolean show;// 鏄惁鏄剧ず
+
+ public Boolean getShow() {
+ return show;
+ }
+
+ public void setShow(Boolean show) {
+ this.show = show;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
+ }
+
public Long getId() {
return id;
}
+
public void setId(Long id) {
this.id = id;
}
+
public UserInfo getUserInfo() {
return userInfo;
}
+
public void setUserInfo(UserInfo userInfo) {
this.userInfo = userInfo;
}
+
public BigDecimal getMoney() {
return money;
}
+
public void setMoney(BigDecimal money) {
this.money = money;
}
+
public UserMoneyDetailTypeEnum getType() {
return type;
}
+
public void setType(UserMoneyDetailTypeEnum type) {
this.type = type;
}
+
public String getTitle() {
return title;
}
+
public void setTitle(String title) {
this.title = title;
}
+
public String getSubTitle() {
return subTitle;
}
+
public void setSubTitle(String subTitle) {
this.subTitle = subTitle;
}
+
public String getDescInfo() {
return descInfo;
}
+
public void setDescInfo(String descInfo) {
this.descInfo = descInfo;
}
+
public Long getSourceIdentifyId() {
return sourceIdentifyId;
}
+
public void setSourceIdentifyId(Long sourceIdentifyId) {
this.sourceIdentifyId = sourceIdentifyId;
}
+
public String getIdentifyCode() {
return identifyCode;
}
+
public void setIdentifyCode(String identifyCode) {
this.identifyCode = identifyCode;
}
+
public String getBeiZhu() {
return beiZhu;
}
+
public void setBeiZhu(String beiZhu) {
this.beiZhu = beiZhu;
}
+
public Date getCreateTime() {
return createTime;
}
+
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
+
public Date getUpdateTime() {
return updateTime;
}
+
public void setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
}
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
}
--
Gitblit v1.8.0