From f21dfb5fc990174724f3f37b07be2c21fa618769 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 八月 2019 12:31:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 4649c6e..8a1651c 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
@@ -63,8 +63,7 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createShare(Long uid, int orderType, int validCount, int weiQuanCount,
- int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {
+ public static UserMoneyDetail createShare(Long uid, int orderType, int validCount, int weiQuanCount, BigDecimal money, Date time) throws UserMoneyDetailException {
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -86,7 +85,7 @@
detail.setMoney(money);
detail.setTitle(timeF + UserMoneyDetailTypeEnum.share.getDesc());
detail.setType(UserMoneyDetailTypeEnum.share);
- detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗� 澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
+ detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗�", validCount, weiQuanCount));
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
detail.setOrderType(orderType);
@@ -105,8 +104,7 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createInvite(Long uid, int orderType, int validCount, int weiQuanCount,
- int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {
+ public static UserMoneyDetail createInvite(Long uid, int orderType, int validCount, int weiQuanCount, BigDecimal money, Date time) throws UserMoneyDetailException {
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -128,8 +126,8 @@
detail.setMoney(money);
detail.setTitle(timeF + UserMoneyDetailTypeEnum.invite.getDesc());
detail.setType(UserMoneyDetailTypeEnum.invite);
- if (validCount != 0 || weiQuanCount != 0 || invalidCount != 0)
- detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗� 澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
+ if (validCount != 0 || weiQuanCount != 0)
+ detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗�", validCount, weiQuanCount));
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
detail.setOrderType(orderType);
--
Gitblit v1.8.0