From a99de6e3ab8c984ad274f53ac350fa56548f2374 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 28 八月 2019 14:38:11 +0800
Subject: [PATCH] 自购立减/分享爆款返回数据修改修改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 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 763141e..4649c6e 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
@@ -15,6 +15,7 @@
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
+import com.yeshi.fanli.util.account.UserUtil;
public class UserMoneyDetailFactory {
@@ -62,8 +63,8 @@
* @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,
+ int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -104,8 +105,8 @@
* @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,
+ int invalidCount, BigDecimal money, Date time) throws UserMoneyDetailException {
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -208,7 +209,7 @@
detail.setSubTitle("璁㈠崟缁存潈");
detail.setType(UserMoneyDetailTypeEnum.shareWeiQuan);
detail.setSourceIdentifyId(drawBack.getId());
- detail.setDescInfo("璁㈠崟鍙凤細" + drawBack.getOrderId());
+ detail.setDescInfo("璁㈠崟鍙凤細" + UserUtil.filterOrderId(drawBack.getOrderId()));
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
@@ -248,7 +249,7 @@
detail.setSubTitle("璁㈠崟缁存潈");
detail.setType(UserMoneyDetailTypeEnum.inviteWeiQuan);
detail.setSourceIdentifyId(drawBack.getId());
- detail.setDescInfo("璁㈠崟鍙凤細" + drawBack.getOrderId());
+ detail.setDescInfo("璁㈠崟鍙凤細" + UserUtil.filterOrderId(drawBack.getOrderId()));
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
detail.setOrderType(Constant.SOURCE_TYPE_TAOBAO);
@@ -422,7 +423,7 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createOrderReward(String orderId,int orderType, BigDecimal money, UserInfo user)
+ public static UserMoneyDetail createOrderReward(String orderId, int orderType, BigDecimal money, UserInfo user)
throws UserMoneyDetailException {
if (StringUtil.isNullOrEmpty(orderId))
throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂笉鑳戒负绌�");
@@ -453,7 +454,7 @@
* @return
* @throws UserMoneyDetailException
*/
- public static UserMoneyDetail createRepeatStatistic(String orderId,int orderType, BigDecimal money, UserInfo user)
+ public static UserMoneyDetail createRepeatStatistic(String orderId, int orderType, BigDecimal money, UserInfo user)
throws UserMoneyDetailException {
if (StringUtil.isNullOrEmpty(orderId))
throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂笉鑳戒负绌�");
@@ -497,10 +498,8 @@
}
return detail;
}
-
-
- public static UserMoneyDetail createScoreConvert(BigDecimal money, UserInfo user)
- throws UserMoneyDetailException {
+
+ public static UserMoneyDetail createScoreConvert(BigDecimal money, UserInfo user) throws UserMoneyDetailException {
if (user == null)
throw new UserMoneyDetailException(1, "UID涓嶈兘涓虹┖");
if (money == null)
@@ -515,7 +514,7 @@
detail.setType(UserMoneyDetailTypeEnum.scoreConvert);
detail.setUpdateTime(new Date());
detail.setUserInfo(user);
-
+
return detail;
}
--
Gitblit v1.8.0