From 23f7b250c00597ad89282075460a4c27dffe1ada Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 一月 2019 17:39:06 +0800
Subject: [PATCH] Merge branch 'dev-msg'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 7946bf9..1d9b340 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -3,6 +3,9 @@
import java.math.BigDecimal;
import java.util.Date;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
+
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.UserInfo;
@@ -13,12 +16,14 @@
* @author Administrator
*
*/
+@Table("yeshi_ec_msg_money")
public class MsgMoneyDetail {
- public enum MsgTypeMoneyEnumType {
- share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉");
+ public enum MsgTypeMoneyTypeEnum {
+ share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉"), shareWeiQuan(
+ "鍒嗕韩濂栭噾鎵ｉ櫎"), inviteWeiQuan("閭�璇峰閲戞墸闄�"), fanliWeiQuan("杩斿埄鎵ｉ櫎");
private final String desc;
- private MsgTypeMoneyEnumType(String desc) {
+ private MsgTypeMoneyTypeEnum(String desc) {
this.desc = desc;
}
@@ -27,19 +32,34 @@
}
}
+ @Column(name = "mm_id")
private Long id;
+ @Column(name = "mm_uid")
private UserInfo user;
- private MsgTypeMoneyEnumType msgType;// 娑堟伅绫诲瀷
+ @Column(name = "mm_type")
+ private MsgTypeMoneyTypeEnum msgType;// 娑堟伅绫诲瀷
+ @Column(name = "mm_order_count")
private Integer orderCount;// 璁㈠崟鏁�(濂栭噾閫傜敤)
+ @Column(name = "mm_goods_count")
private Integer goodsCount;// 鍟嗗搧鏁�
+ @Column(name = "mm_order_id")
private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
+ @Column(name = "mm_source_id")
private Extract extract;// 鎻愮幇璇︽儏
private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
+ @Column(name = "mm_money")
private BigDecimal money;// 鍒拌处璧勯噾
+ @Column(name = "mm_balance")
private BigDecimal balance;// 璐︽埛浣欓
+ @Column(name = "mm_state_desc")
+ private String stateDesc;// 鐘舵�佽鏄�
+ @Column(name = "mm_beizhu")
private String beiZhu;// 澶囨敞
+ @Column(name = "mm_create_time")
private Date createTime;
+ @Column(name = "mm_update_time")
private Date updateTime;
+ @Column(name = "mm_read")
private Boolean read;
public Long getId() {
@@ -58,11 +78,19 @@
this.user = user;
}
- public MsgTypeMoneyEnumType getMsgType() {
+ public String getStateDesc() {
+ return stateDesc;
+ }
+
+ public void setStateDesc(String stateDesc) {
+ this.stateDesc = stateDesc;
+ }
+
+ public MsgTypeMoneyTypeEnum getMsgType() {
return msgType;
}
- public void setMsgType(MsgTypeMoneyEnumType msgType) {
+ public void setMsgType(MsgTypeMoneyTypeEnum msgType) {
this.msgType = msgType;
}
--
Gitblit v1.8.0