From 148af6b2f57be264c84d0991237fbd7ddea491a4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 04 十一月 2019 09:55:55 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 81 +++++++++++++++++++++++++++++++++++++---
1 files changed, 75 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 f65cf4f..d9679e6 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,35 @@
* @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("鎻愮幇"),
+ extractAutoWX("鑷姩鎻愮幇"),
+ extractValid("鎻愮幇璐﹀彿楠岃瘉"),
+ shareWeiQuan("鍒嗕韩濂栭噾鎵ｉ櫎"),
+ inviteWeiQuan("閭�璇峰閲戞墸闄�"),
+ fanliWeiQuan("杩斿埄鎵ｉ櫎"),
+ orderReward("杩斿埄濂栧姳"),
+ systemEqualize("绯荤粺琛ラ綈"),
+ fanliElme("杩斿埄鍒拌处"),
+ subSidy("棰濆琛ヨ创"),
+ redPackGiveOff("璧犻�佺孩鍖呭畬鎴�"),
+ redPackReceiveOff("璧犻�佺孩鍖呴鍙�"),
+ redPackGiveBack("绾㈠寘閫�鍥�"),
+ redPackExchangePass("绾㈠寘鎻愮幇鎴愬姛"),
+ redPackExchangeReject("绾㈠寘鎻愮幇澶辫触"),
+ redPackNewUserReward("鏂颁汉濂栧姳-瀹屾垚棣栫瑪璁㈠崟"),
+ redPackInviteSucceed("绔嬪緱鐜伴噾-鎴愬姛閭�璇峰ソ鍙�"),
+ redPackFirstSharedOrder("閫掑濂栧姳-濂藉弸瀹屾垚璁㈠崟"),
+ redPackMonthSharedOrder("杩炵画濂栧姳-濂藉弸瀹屾垚璁㈠崟");
+
private final String desc;
- private MsgTypeMoneyEnumType(String desc) {
+ private MsgTypeMoneyTypeEnum(String desc) {
this.desc = desc;
}
@@ -27,21 +53,41 @@
}
}
+ @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_order_type")
+ private Integer orderType;
+ @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_desc")
+ private String desc;// 璇存槑
+ @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;
+ @Column(name = "mm_content") // 娑堟伅鍐呭
+ private String content;
public Long getId() {
return id;
@@ -67,11 +113,11 @@
this.stateDesc = stateDesc;
}
- public MsgTypeMoneyEnumType getMsgType() {
+ public MsgTypeMoneyTypeEnum getMsgType() {
return msgType;
}
- public void setMsgType(MsgTypeMoneyEnumType msgType) {
+ public void setMsgType(MsgTypeMoneyTypeEnum msgType) {
this.msgType = msgType;
}
@@ -163,4 +209,27 @@
this.alipayAccountValid = alipayAccountValid;
}
+ public Integer getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(Integer orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public String getContent() {
+ return content;
+ }
+
+ public void setContent(String content) {
+ this.content = content;
+ }
}
--
Gitblit v1.8.0