From 0b9f71d36cbd76288ebb041f35cc1cddb224f692 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 14 一月 2019 17:50:24 +0800
Subject: [PATCH] 订单实体创建
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeMoney.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
similarity index 79%
rename from fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeMoney.java
rename to fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index de5daf0..7946bf9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/content/MsgTypeMoney.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -1,9 +1,9 @@
-package com.yeshi.fanli.entity.bus.msg.content;
+package com.yeshi.fanli.entity.bus.msg;
import java.math.BigDecimal;
import java.util.Date;
-import com.yeshi.fanli.entity.bus.GoodsSourceTypeEnum;
+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,9 +13,9 @@
* @author Administrator
*
*/
-public class MsgTypeMoney {
+public class MsgMoneyDetail {
public enum MsgTypeMoneyEnumType {
- extract("鎻愮幇"), shareMoney("濂栭噾鍒拌处"), fanLiMoney("杩斿埄鍒拌处");
+ share("鍒嗕韩濂栭噾"), invite("閭�璇峰閲�"), fanli("杩斿埄鍒拌处"), extract("鎻愮幇"), extractValid("鎻愮幇璐﹀彿楠岃瘉");
private final String desc;
private MsgTypeMoneyEnumType(String desc) {
@@ -31,10 +31,10 @@
private UserInfo user;
private MsgTypeMoneyEnumType msgType;// 娑堟伅绫诲瀷
private Integer orderCount;// 璁㈠崟鏁�(濂栭噾閫傜敤)
- private Integer goodsCount;
+ private Integer goodsCount;// 鍟嗗搧鏁�
private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
- private GoodsSourceTypeEnum sourceType;// 浜х敓璁㈠崟鐨勫晢鍝佹潵婧愮被鍨�
private Extract extract;// 鎻愮幇璇︽儏
+ private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
private BigDecimal money;// 鍒拌处璧勯噾
private BigDecimal balance;// 璐︽埛浣欓
private String beiZhu;// 澶囨敞
@@ -88,14 +88,6 @@
public void setOrderId(String orderId) {
this.orderId = orderId;
- }
-
- public GoodsSourceTypeEnum getSourceType() {
- return sourceType;
- }
-
- public void setSourceType(GoodsSourceTypeEnum sourceType) {
- this.sourceType = sourceType;
}
public Extract getExtract() {
@@ -154,4 +146,12 @@
this.read = read;
}
+ public AlipayAccountValidNormalHistory getAlipayAccountValid() {
+ return alipayAccountValid;
+ }
+
+ public void setAlipayAccountValid(AlipayAccountValidNormalHistory alipayAccountValid) {
+ this.alipayAccountValid = alipayAccountValid;
+ }
+
}
--
Gitblit v1.8.0