From 34e65d72e73acab040b68d01ef6b4764b4408624 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 05 八月 2019 10:07:38 +0800
Subject: [PATCH] 修改推荐记录点击详情跳转方式不对的bug
---
fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java | 38 +++-----------------------------------
1 files changed, 3 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java
index 98e573b..47c57b4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java
@@ -4,19 +4,13 @@
import java.util.HashMap;
import java.util.Map;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
-import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.HongBao;
-import com.yeshi.fanli.entity.bus.user.OrderItem;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.dto.money.AccountDetails;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TimeUtil;
public class AccountDetailsFactory {
-
private static final Map<Integer, String> map = new HashMap<Integer, String>();
/**
* 鎻愮幇
@@ -76,32 +70,6 @@
map.put(XINREN_DEDUCT, "鏂颁汉绾㈠寘鎵ｉ櫎");
}
- public static AccountDetails create(String money, int type, OrderItem orderItem, Extract extract,
- UserInfo userInfo) {
- AccountDetails ad = new AccountDetails();
- ad.setCreateTime(TimeUtil.getWholeTime(System.currentTimeMillis()));
- ad.setExtract(extract);
- ad.setMoney(money);
- ad.setType(type);
- ad.setOrderItem(orderItem);
- ad.setUserInfo(userInfo);
- String title = map.get(type);
- ad.setTitle(title);
- return ad;
- }
-
- public static AccountDetails create(HongBao hb, OrderItem orderItem) {
- int type = hb.getType();
- if (type == Constant.TAOBAO) {
- return create("+" + hb.getMoney(), FANLI, orderItem, null, hb.getUserInfo());
- } else if (type == Constant.ONESALE || type == Constant.TAOBAO) {
- return create("+" + hb.getMoney(), TICHENG, null, null, hb.getUserInfo());
- } else if (type == Constant.HB_NEWUSER) {
- return create("+" + hb.getMoney(), XINREN, null, null, hb.getUserInfo());
- }
- return null;
- }
-
public static AccountDetails create(UserMoneyDetail userMoneyDetail) {
AccountDetails accountDetails = new AccountDetails(userMoneyDetail.getId());
accountDetails.setCreateTime(
@@ -109,7 +77,7 @@
if (userMoneyDetail.getMoney().compareTo(new BigDecimal("0")) >= 0)
accountDetails.setMoney("+" + MoneyBigDecimalUtil.getWithNoZera(userMoneyDetail.getMoney()));
else
- accountDetails.setMoney( MoneyBigDecimalUtil.getWithNoZera(userMoneyDetail.getMoney()) + "");
+ accountDetails.setMoney(MoneyBigDecimalUtil.getWithNoZera(userMoneyDetail.getMoney()) + "");
accountDetails.setState(userMoneyDetail.getState());
String typeName = userMoneyDetail.getType().name();
@@ -141,7 +109,7 @@
accountDetails.setType(AccountDetailsFactory.TUIKUAN);
else
accountDetails.setType(AccountDetailsFactory.QITA);
- accountDetails.setTitle(map.get(accountDetails.getType()));
+ accountDetails.setTitle(accountDetails.getTitle());
accountDetails.setUserInfo(userMoneyDetail.getUserInfo());
return accountDetails;
}
--
Gitblit v1.8.0