From 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 10 九月 2019 16:54:11 +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 | 8 +++++---
1 files changed, 5 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 8a1651c..d4c24bc 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,7 +63,8 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createShare(Long uid, int orderType, int validCount, int weiQuanCount, 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, "杩斿埄閲戦涓虹┖");
@@ -104,7 +105,8 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createInvite(Long uid, int orderType, int validCount, int weiQuanCount, 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, "杩斿埄閲戦涓虹┖");
@@ -439,7 +441,7 @@
detail.setUpdateTime(new Date());
detail.setUserInfo(user);
detail.setOrderType(orderType);
- // detail.setDescInfo("璁㈠崟鍙�:" + orderId);
+ detail.setDescInfo("璁㈠崟鍙�:" + orderId);
return detail;
}
--
Gitblit v1.8.0