From d2357693d74ec048ed19e483ea29f87d823cde5f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 22 七月 2019 16:26:23 +0800
Subject: [PATCH] 资金明细添加京东，拼多多兼容

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 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 7a654ee..ec75fd8 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
@@ -12,6 +12,7 @@
 import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
 import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;
 import com.yeshi.fanli.exception.money.UserMoneyDetailException;
+import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.StringUtil;
 import com.yeshi.fanli.util.TimeUtil;
 
@@ -45,6 +46,7 @@
 		detail.setDescInfo("璁㈠崟鍙凤細" + orderId);
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(orderType);
 		return detail;
 	}
 
@@ -60,7 +62,7 @@
 	 * @return
 	 * @throws UserMoneyDetailException
 	 */
-	public static UserMoneyDetail createShare(Long uid, int validCount, int weiQuanCount, int invalidCount,
+	public static UserMoneyDetail createShare(Long uid,int orderType, int validCount, int weiQuanCount, int invalidCount,
 			BigDecimal money, Date time) throws UserMoneyDetailException {
 		if (money == null)
 			throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -86,6 +88,7 @@
 		detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗�  缁存潈璁㈠崟:%s绗�  澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(orderType);
 		return detail;
 	}
 
@@ -101,7 +104,7 @@
 	 * @return
 	 * @throws UserMoneyDetailException
 	 */
-	public static UserMoneyDetail createInvite(Long uid, int validCount, int weiQuanCount, int invalidCount,
+	public static UserMoneyDetail createInvite(Long uid,int orderType, int validCount, int weiQuanCount, int invalidCount,
 			BigDecimal money, Date time) throws UserMoneyDetailException {
 		if (money == null)
 			throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -128,6 +131,7 @@
 			detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗�   缁存潈璁㈠崟:%s绗�   澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(orderType);
 		return detail;
 	}
 
@@ -167,6 +171,7 @@
 		detail.setDescInfo("璁㈠崟鍙凤細" + drawBack.getOrderId());
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
 		return detail;
 	}
 
@@ -206,6 +211,7 @@
 		detail.setDescInfo("璁㈠崟鍙凤細" + drawBack.getOrderId());
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
 		return detail;
 	}
 
@@ -245,6 +251,7 @@
 		detail.setDescInfo("璁㈠崟鍙凤細" + drawBack.getOrderId());
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(new UserInfo(uid));
+		detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
 		return detail;
 	}
 
@@ -415,7 +422,7 @@
 	 * @return
 	 * @throws UserMoneyDetailException
 	 */
-	public static UserMoneyDetail createOrderReward(String orderId, BigDecimal money, UserInfo user)
+	public static UserMoneyDetail createOrderReward(String orderId,int orderType, BigDecimal money, UserInfo user)
 			throws UserMoneyDetailException {
 		if (StringUtil.isNullOrEmpty(orderId))
 			throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂笉鑳戒负绌�");
@@ -432,6 +439,7 @@
 		detail.setType(UserMoneyDetailTypeEnum.orderReward);
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(user);
+		detail.setOrderType(orderType);
 		// detail.setDescInfo("璁㈠崟鍙�:" + orderId);
 		return detail;
 	}
@@ -445,7 +453,7 @@
 	 * @return
 	 * @throws UserMoneyDetailException
 	 */
-	public static UserMoneyDetail createRepeatStatistic(String orderId, BigDecimal money, UserInfo user)
+	public static UserMoneyDetail createRepeatStatistic(String orderId,int orderType,  BigDecimal money, UserInfo user)
 			throws UserMoneyDetailException {
 		if (StringUtil.isNullOrEmpty(orderId))
 			throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂笉鑳戒负绌�");
@@ -464,6 +472,7 @@
 		detail.setUpdateTime(new Date());
 		detail.setUserInfo(user);
 		detail.setDescInfo("璁㈠崟鍙�:" + orderId);
+		detail.setOrderType(orderType);
 		return detail;
 	}
 

--
Gitblit v1.8.0