From 1151bde4c247b3801f7ab750c7abcc79a6514e10 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 11 四月 2020 09:21:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 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 f0f3f0c..d5be6d6 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
@@ -600,10 +600,20 @@
detail.setOrderType(orderType);
return detail;
}
-
-
-
- public static UserMoneyDetail createOrderTeamReward(Long uid,BigDecimal money, Date time)
+
+ /**
+ * 鍥㈤槦鍒嗙孩
+ * @Title: createOrderTeamDividents
+ * @Description:
+ * @param uid
+ * @param money
+ * @param time
+ * @return
+ * @throws UserMoneyDetailException
+ * UserMoneyDetail 杩斿洖绫诲瀷
+ * @throws
+ */
+ public static UserMoneyDetail createOrderTeamDividents(Long uid, BigDecimal money, Date time)
throws UserMoneyDetailException {
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -623,12 +633,11 @@
UserMoneyDetail detail = new UserMoneyDetail();
detail.setCreateTime(new Date());
detail.setIdentifyCode(
- StringUtil.Md5(UserMoneyDetailTypeEnum.orderTeamReward.name() + "-" + uid + "-" + timeF));
+ StringUtil.Md5(UserMoneyDetailTypeEnum.orderTeamDividents.name() + "-" + uid + "-" + timeF));
detail.setMoney(money);
- detail.setTitle(
- timeF + UserMoneyDetailTypeEnum.orderTeamReward.getDesc());
- detail.setType(UserMoneyDetailTypeEnum.orderTeamReward);
- detail.setDescInfo("鍥㈤槦濂栧姳");
+ detail.setTitle(timeF + UserMoneyDetailTypeEnum.orderTeamDividents.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.orderTeamDividents);
+ detail.setDescInfo("鍥㈤槦鍒嗙孩");
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
return detail;
--
Gitblit v1.8.0