From 5ca8157adb3236d7817b487a5ff6f4efa12006d2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 25 十一月 2019 14:25:27 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 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 82be1f4..4013cee 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
@@ -117,7 +117,8 @@
 
 		UserMoneyDetail detail = new UserMoneyDetail();
 		detail.setCreateTime(new Date());
-		detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.share.name() + "-" + uid + "-" + timeF));
+		detail.setIdentifyCode(
+				StringUtil.Md5(UserMoneyDetailTypeEnum.share.name() + "-" + orderType + "-" + uid + "-" + timeF));
 		detail.setMoney(money);
 		detail.setTitle(timeF + UserMoneyDetailTypeEnum.share.getDesc());
 		detail.setType(UserMoneyDetailTypeEnum.share);
@@ -159,7 +160,8 @@
 
 		UserMoneyDetail detail = new UserMoneyDetail();
 		detail.setCreateTime(new Date());
-		detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.invite.name() + "-" + uid + "-" + timeF));
+		detail.setIdentifyCode(
+				StringUtil.Md5(UserMoneyDetailTypeEnum.invite.name() + "-" + orderType + "-" + uid + "-" + timeF));
 		detail.setMoney(money);
 		detail.setTitle(timeF + UserMoneyDetailTypeEnum.invite.getDesc());
 		detail.setType(UserMoneyDetailTypeEnum.invite);

--
Gitblit v1.8.0