From e6cb7c27384f22b39ccee584028e23b56c30e9ee Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 07 三月 2019 15:01:22 +0800
Subject: [PATCH] 券推送调用

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
index d1d763f..c40e187 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java
@@ -24,7 +24,7 @@
 	 * @param hongBaoList
 	 * @return
 	 */
-	public static UserMoneyDetail createFanLi(Long uid, String orderId, int orderType,Long hbId, BigDecimal money)
+	public static UserMoneyDetail createFanLi(Long uid, String orderId, int orderType, Long hbId, BigDecimal money)
 			throws UserMoneyDetailException {
 
 		if (StringUtil.isNullOrEmpty(orderId))
@@ -38,8 +38,8 @@
 
 		UserMoneyDetail detail = new UserMoneyDetail();
 		detail.setCreateTime(new Date());
-		detail.setIdentifyCode(
-				StringUtil.Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId+"-"+hbId));
+		detail.setIdentifyCode(StringUtil
+				.Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId + "-" + hbId));
 		detail.setMoney(money);
 		detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc());
 		detail.setType(UserMoneyDetailTypeEnum.fanli);
@@ -408,6 +408,7 @@
 		detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractReject.name() + ":" + extract.getId()));
 		detail.setMoney(extract.getMoney());
 		detail.setSourceIdentifyId(extract.getId());
+		detail.setSubTitle("鍘熻矾閫�鍥�");
 		detail.setTitle(UserMoneyDetailTypeEnum.extractReject.getDesc());
 		detail.setType(UserMoneyDetailTypeEnum.extractReject);
 		detail.setUpdateTime(new Date());
@@ -589,4 +590,34 @@
 		return detail;
 	}
 
+	/**
+	 * 杩斿埄濂栧姳
+	 * 
+	 * @param orderId
+	 * @param money
+	 * @param user
+	 * @return
+	 * @throws UserMoneyDetailException
+	 */
+	public static UserMoneyDetail createOrderReward(String orderId, BigDecimal money, UserInfo user)
+			throws UserMoneyDetailException {
+		if (StringUtil.isNullOrEmpty(orderId))
+			throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂笉鑳戒负绌�");
+		if (user == null)
+			throw new UserMoneyDetailException(1, "UID涓嶈兘涓虹┖");
+		if (money == null)
+			throw new UserMoneyDetailException(1, "閲戦涓嶈兘涓虹┖");
+
+		UserMoneyDetail detail = new UserMoneyDetail();
+		detail.setCreateTime(new Date());
+		detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.hongbao.name() + "-" + "鑰佺増鏈�" + "-" + orderId));
+		detail.setMoney(money);
+		detail.setTitle(UserMoneyDetailTypeEnum.orderReward.getDesc());
+		detail.setType(UserMoneyDetailTypeEnum.orderReward);
+		detail.setUpdateTime(new Date());
+		detail.setUserInfo(user);
+//		detail.setDescInfo("璁㈠崟鍙�:" + orderId);
+		return detail;
+	}
+
 }

--
Gitblit v1.8.0