From 4cb15e222cd7d099d533ccbeb7f9a8cd99bf180c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 十二月 2018 16:35:18 +0800
Subject: [PATCH] 替换原来老的资金详情
---
fanli/src/main/java/com/yeshi/fanli/util/factory/AccountDetailsFactory.java | 108 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 79 insertions(+), 29 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 8abaea4..98e573b 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
@@ -1,5 +1,6 @@
package com.yeshi.fanli.util.factory;
+import java.math.BigDecimal;
import java.util.HashMap;
import java.util.Map;
@@ -8,56 +9,60 @@
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.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>();
+
+ private static final Map<Integer, String> map = new HashMap<Integer, String>();
/**
* 鎻愮幇
*/
- public static final int TIXIAN=1;
+ public static final int TIXIAN = 1;
/**
* 杩斿埄
*/
- public static final int FANLI=2;
+ public static final int FANLI = 2;
/**
* 鍒嗛攢鎻愭垚
*/
- public static final int TICHENG=3;
+ public static final int TICHENG = 3;
/**
* 閫�娆�
*/
- public static final int TUIKUAN=4;
+ public static final int TUIKUAN = 4;
/**
* 鏂颁汉绾㈠寘
*/
- public static final int XINREN=5;
+ public static final int XINREN = 5;
/**
* 鍥炴锛堟彁鐜板け璐ユ椂锛�
*/
- public static final int HUIKUAN=6;
+ public static final int HUIKUAN = 6;
/**
* 鍏朵粬
*/
- public static final int QITA=7;
-
+ public static final int QITA = 7;
+
/**
* 鍟嗗搧鍒嗛攢
*/
- public static final int SHARE_GOODS=8;
-
- //鍟嗗搧鍒嗛攢缁存潈
- public static final int SHARE_GOODS_DRAWBACK=9;
-
+ public static final int SHARE_GOODS = 8;
+
+ // 鍟嗗搧鍒嗛攢缁存潈
+ public static final int SHARE_GOODS_DRAWBACK = 9;
+
/**
*
*/
- public static final int VALID_ALIPAY_ACCOUNT=10;
-
-
- static{
+ public static final int VALID_ALIPAY_ACCOUNT = 10;
+
+ public static final int XINREN_DEDUCT = 11;
+
+ static {
map.put(TIXIAN, "鎻愮幇");
map.put(FANLI, "璁㈠崟杩斿埄");
map.put(TICHENG, "濂栭噾鏀跺叆");
@@ -68,9 +73,11 @@
map.put(SHARE_GOODS, "鎻愭垚鏀跺叆");
map.put(SHARE_GOODS_DRAWBACK, "鍞悗璁㈠崟鎵ｆ");
map.put(VALID_ALIPAY_ACCOUNT, "鏀粯瀹濊处鍙烽獙璇佹墦娆�");
+ map.put(XINREN_DEDUCT, "鏂颁汉绾㈠寘鎵ｉ櫎");
}
-
- public static AccountDetails create(String money,int type,OrderItem orderItem,Extract extract,UserInfo userInfo){
+
+ 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);
@@ -85,15 +92,58 @@
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());
+ 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(
+ TimeUtil.getGernalTime(userMoneyDetail.getCreateTime().getTime(), "yyyy-MM-dd HH:mm:ss"));
+ if (userMoneyDetail.getMoney().compareTo(new BigDecimal("0")) >= 0)
+ accountDetails.setMoney("+" + MoneyBigDecimalUtil.getWithNoZera(userMoneyDetail.getMoney()));
+ else
+ accountDetails.setMoney( MoneyBigDecimalUtil.getWithNoZera(userMoneyDetail.getMoney()) + "");
+ accountDetails.setState(userMoneyDetail.getState());
+
+ String typeName = userMoneyDetail.getType().name();
+ if (UserMoneyDetailTypeEnum.extract.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(TIXIAN);
+ else if (UserMoneyDetailTypeEnum.extractReject.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(HUIKUAN);
+ else if (UserMoneyDetailTypeEnum.extractVerify.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(VALID_ALIPAY_ACCOUNT);
+ else if (UserMoneyDetailTypeEnum.fanli.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.FANLI);
+ else if (UserMoneyDetailTypeEnum.fanliWeiQuan.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.TUIKUAN);
+ else if (UserMoneyDetailTypeEnum.hongbao.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.XINREN);
+ else if (UserMoneyDetailTypeEnum.hongbaoDeduct.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.XINREN_DEDUCT);
+ else if (UserMoneyDetailTypeEnum.invite.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.SHARE_GOODS);
+ else if (UserMoneyDetailTypeEnum.inviteAndShare.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.SHARE_GOODS);
+ else if (UserMoneyDetailTypeEnum.inviteWeiQuan.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.TUIKUAN);
+ else if (UserMoneyDetailTypeEnum.share.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.SHARE_GOODS);
+ else if (UserMoneyDetailTypeEnum.shareWeiQuan.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.TUIKUAN);
+ else if (UserMoneyDetailTypeEnum.weiQuan.name().equalsIgnoreCase(typeName))
+ accountDetails.setType(AccountDetailsFactory.TUIKUAN);
+ else
+ accountDetails.setType(AccountDetailsFactory.QITA);
+ accountDetails.setTitle(map.get(accountDetails.getType()));
+ accountDetails.setUserInfo(userMoneyDetail.getUserInfo());
+ return accountDetails;
+ }
+
}
--
Gitblit v1.8.0