From 4706fa0dcd761c13f0f7f33e4e7ab804e0a21f4f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 十月 2019 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
index 8eb9b87..205bc1a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
@@ -7,6 +7,7 @@
 import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
 import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
 import com.yeshi.fanli.entity.bus.user.Extract;
+import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
 
@@ -59,6 +60,32 @@
 	}
 
 	/**
+	 *  鑷姩鎻愮幇
+	 * 
+	 * @param extract
+	 * @param uid
+	 * @param beiZhu
+	 * @return
+	 */
+	public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc, 
+			String desc, String beiZhu) {
+		if (extractRecord == null)
+			return null;
+		MsgMoneyDetail detail = new MsgMoneyDetail();
+		detail.setUser(new UserInfo(extractRecord.getUid()));
+		detail.setRead(false);
+		detail.setMoney(extractRecord.getMoney());
+		detail.setMsgType(MsgTypeMoneyTypeEnum.extractAutoWX);
+		detail.setExtract(new Extract(extractRecord.getId()));
+		detail.setStateDesc(stateDesc);
+		detail.setDesc(desc);
+		detail.setBeiZhu(beiZhu);
+		detail.setCreateTime(new Date());
+		return detail;
+	}
+
+	
+	/**
 	 * 鎻愮幇澶辫触娑堟伅
 	 * 
 	 * @param extract

--
Gitblit v1.8.0