From 1fd8f11537bb74c1f7e611e35a766cbbd34eff05 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 07 十二月 2019 18:14:43 +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 | 11 ++++++++---
1 files changed, 8 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 25c7be7..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);
@@ -316,6 +318,7 @@
detail.setType(UserMoneyDetailTypeEnum.extract);
detail.setUpdateTime(new Date());
detail.setUserInfo(extract.getUserInfo());
+ detail.setShow(false);
return detail;
}
@@ -375,6 +378,7 @@
detail.setType(UserMoneyDetailTypeEnum.extractReject);
detail.setUpdateTime(new Date());
detail.setUserInfo(extract.getUserInfo());
+ detail.setShow(false);// 闅愯棌鎻愮幇澶辫触璁板綍
return detail;
}
@@ -587,7 +591,8 @@
detail.setIdentifyCode(
StringUtil.Md5(UserMoneyDetailTypeEnum.subsidy.name() + "-" + orderType + "-" + uid + "-" + timeF));
detail.setMoney(money);
- detail.setTitle(timeF + UserMoneyDetailTypeEnum.subsidy.getDesc()+"["+Constant.getSourceName(orderType)+"]");
+ detail.setTitle(
+ timeF + UserMoneyDetailTypeEnum.subsidy.getDesc() + "銆�" + Constant.getSourceName(orderType) + "銆�");
detail.setType(UserMoneyDetailTypeEnum.subsidy);
detail.setDescInfo("閭�璇疯鍗曡ˉ璐�");
detail.setUpdateTime(new Date());
--
Gitblit v1.8.0