From dbc8f0b2058d809e6dad0ada92d391109cbb4f57 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 15 十一月 2019 15:05:53 +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 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 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 349e769..82be1f4 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
@@ -316,6 +316,7 @@
detail.setType(UserMoneyDetailTypeEnum.extract);
detail.setUpdateTime(new Date());
detail.setUserInfo(extract.getUserInfo());
+ detail.setShow(false);
return detail;
}
@@ -375,6 +376,7 @@
detail.setType(UserMoneyDetailTypeEnum.extractReject);
detail.setUpdateTime(new Date());
detail.setUserInfo(extract.getUserInfo());
+ detail.setShow(false);// 闅愯棌鎻愮幇澶辫触璁板綍
return detail;
}
@@ -553,4 +555,48 @@
return detail;
}
+ /**
+ * 閭�璇峰閲戝埌璐�
+ *
+ * @param uid
+ * @param validCount
+ * @param weiQuanCount
+ * @param invalidCount
+ * @param money
+ * @param time
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createInviteSubsidy(Long uid, int orderType, BigDecimal money, Date time)
+ throws UserMoneyDetailException {
+ if (money == null)
+ throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
+
+ if (uid == null)
+ throw new UserMoneyDetailException(1, "UID涓虹┖");
+
+ if (time == null)
+ throw new UserMoneyDetailException(1, "鍙戠敓鏃堕棿涓虹┖");
+
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(time);
+ ca.add(Calendar.MONTH, -1);
+
+ String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy.M");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(
+ StringUtil.Md5(UserMoneyDetailTypeEnum.subsidy.name() + "-" + orderType + "-" + uid + "-" + timeF));
+ detail.setMoney(money);
+ detail.setTitle(
+ timeF + UserMoneyDetailTypeEnum.subsidy.getDesc() + "銆�" + Constant.getSourceName(orderType) + "銆�");
+ detail.setType(UserMoneyDetailTypeEnum.subsidy);
+ detail.setDescInfo("閭�璇疯鍗曡ˉ璐�");
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(new UserInfo(uid));
+ detail.setOrderType(orderType);
+ return detail;
+ }
+
}
--
Gitblit v1.8.0