From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 218 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 dfab333..de3fc4f 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
@@ -4,6 +4,7 @@
import java.util.Calendar;
import java.util.Date;
+import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
import com.yeshi.fanli.entity.bus.user.HongBao;
@@ -23,10 +24,12 @@
* @param hongBaoList
* @return
*/
- public static UserMoneyDetail createFanLi(Long uid, String orderId, BigDecimal money)
+ public static UserMoneyDetail createFanLi(Long uid, String orderId, int orderType,Long hbId, BigDecimal money)
throws UserMoneyDetailException {
+
if (StringUtil.isNullOrEmpty(orderId))
throw new UserMoneyDetailException(1, "璁㈠崟鍙蜂负绌�");
+
if (money == null)
throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
@@ -35,11 +38,52 @@
UserMoneyDetail detail = new UserMoneyDetail();
detail.setCreateTime(new Date());
- detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.fanli.name() + ":" + orderId));
+ detail.setIdentifyCode(
+ StringUtil.Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId+"-"+hbId));
detail.setMoney(money);
detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc());
detail.setType(UserMoneyDetailTypeEnum.fanli);
detail.setDescInfo("璁㈠崟鍙凤細" + orderId);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(new UserInfo(uid));
+ return detail;
+ }
+
+ /**
+ * 鍘熸湁杩斿埄鏁版嵁鍚屾
+ *
+ * @param uid
+ * @param orderId
+ * @param orderType
+ * @param money
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createOldFanLi(Long uid, AccountDetails accountDetails, BigDecimal money)
+ throws UserMoneyDetailException {
+ int orderType = 1;
+ String orderId = null;
+ if (accountDetails.getOrderItem() == null)
+ orderId = accountDetails.getId() + "";
+ else
+ orderId = accountDetails.getId() + "-" + accountDetails.getOrderItem().getOrderId();
+
+ if (money == null)
+ throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
+
+ if (uid == null)
+ throw new UserMoneyDetailException(1, "UID涓虹┖");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(accountDetails.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
+ detail.setIdentifyCode(
+ StringUtil.Md5(UserMoneyDetailTypeEnum.fanli.name() + "-" + uid + "-" + orderType + "-" + orderId));
+ detail.setMoney(money);
+ detail.setTitle(UserMoneyDetailTypeEnum.fanli.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.fanli);
+ if (accountDetails.getOrderItem() != null)
+ detail.setDescInfo("璁㈠崟鍙凤細" + accountDetails.getOrderItem().getOrderId());
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
return detail;
@@ -121,9 +165,50 @@
detail.setMoney(money);
detail.setTitle(timeF + UserMoneyDetailTypeEnum.invite.getDesc());
detail.setType(UserMoneyDetailTypeEnum.invite);
- detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗� 澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
+ if (validCount != 0 || weiQuanCount != 0 || invalidCount != 0)
+ detail.setDescInfo(String.format("鏈夋晥璁㈠崟:%s绗� 缁存潈璁㈠崟:%s绗� 澶辨晥璁㈠崟:%s绗�", validCount, weiQuanCount, invalidCount));
detail.setUpdateTime(new Date());
detail.setUserInfo(new UserInfo(uid));
+ return detail;
+ }
+
+ /**
+ * 鑰佺増鏈殑鍒嗕韩鍜岄個璇疯禋鍒拌处璁板綍
+ *
+ * @param uid
+ * @param money
+ * @param time
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createShareAndInvite(AccountDetails accountDetail) throws UserMoneyDetailException {
+ if (accountDetail.getMoney() == null)
+ throw new UserMoneyDetailException(1, "杩斿埄閲戦涓虹┖");
+
+ if (accountDetail.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "UID涓虹┖");
+
+ if (accountDetail.getCreateTime() == null)
+ throw new UserMoneyDetailException(1, "鍙戠敓鏃堕棿涓虹┖");
+
+ Date time = new Date(TimeUtil.convertToTimeTemp(accountDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"));
+
+ Calendar ca = Calendar.getInstance();
+ ca.setTime(time);
+ ca.add(Calendar.MONTH, -1);
+
+ String timeF = TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy骞碝M鏈�");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(
+ new Date(TimeUtil.convertToTimeTemp(accountDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
+ detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.inviteAndShare.name() + "-"
+ + accountDetail.getUserInfo().getId() + "-" + accountDetail.getId()));
+ detail.setMoney(new BigDecimal(accountDetail.getMoney()));
+ detail.setTitle(timeF + UserMoneyDetailTypeEnum.inviteAndShare.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.inviteAndShare);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(accountDetail.getUserInfo());
return detail;
}
@@ -323,6 +408,7 @@
detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractReject.name() + ":" + extract.getId()));
detail.setMoney(extract.getMoney());
detail.setSourceIdentifyId(extract.getId());
+ detail.setSubTitle("鍘熻矾閫�鍥�");
detail.setTitle(UserMoneyDetailTypeEnum.extractReject.getDesc());
detail.setType(UserMoneyDetailTypeEnum.extractReject);
detail.setUpdateTime(new Date());
@@ -346,12 +432,33 @@
UserMoneyDetail detail = new UserMoneyDetail();
detail.setCreateTime(new Date());
- detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.hongbao.name() + ":" + hb.getId()));
+ detail.setIdentifyCode(
+ StringUtil.Md5(UserMoneyDetailTypeEnum.hongbao.name() + "-" + subTitle + "-" + hb.getId()));
detail.setMoney(hb.getMoney());
detail.setSourceIdentifyId(hb.getId());
detail.setTitle(UserMoneyDetailTypeEnum.hongbao.getDesc());
detail.setSubTitle(subTitle);
detail.setType(UserMoneyDetailTypeEnum.hongbao);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(hb.getUserInfo());
+ return detail;
+ }
+
+ private static UserMoneyDetail createHongBaoDeduct(HongBao hb, String subTitle) throws UserMoneyDetailException {
+ if (hb == null)
+ throw new UserMoneyDetailException(1, "绾㈠寘涓嶈兘涓虹┖");
+ if (hb.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "鐢ㄦ埛涓嶈兘涓虹┖");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.hongbaoDeduct.name() + "-" + subTitle + "-"
+ + hb.getBeizhu() + "-" + hb.getId()));
+ detail.setMoney(hb.getMoney());
+ detail.setSourceIdentifyId(hb.getId());
+ detail.setTitle(UserMoneyDetailTypeEnum.hongbaoDeduct.getDesc());
+ detail.setSubTitle(subTitle);
+ detail.setType(UserMoneyDetailTypeEnum.hongbaoDeduct);
detail.setUpdateTime(new Date());
detail.setUserInfo(hb.getUserInfo());
return detail;
@@ -370,13 +477,117 @@
/**
* 鏂颁汉绾㈠寘鎵ｉ櫎
+ *
* @param hb
* @return
* @throws UserMoneyDetailException
*/
-
+
public static UserMoneyDetail createNewerHongBaoDeduct(HongBao hb) throws UserMoneyDetailException {
- return createHongBao(hb, "鏂颁汉绾㈠寘鎵ｉ櫎");
+ return createHongBaoDeduct(hb, "鏂颁汉绾㈠寘鎵ｉ櫎");
}
-
+
+ /**
+ * 鑰佺増鏈殑鏂颁汉绾㈠寘閫�娆�
+ *
+ * @param hb
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createOldNewerHongBaoDeduct(AccountDetails accountDetails)
+ throws UserMoneyDetailException {
+ HongBao hb = new HongBao();
+ hb.setId(accountDetails.getId());
+ hb.setBeizhu("鑰佺増鏈�");
+ hb.setMoney(new BigDecimal(accountDetails.getMoney()));
+ hb.setUserInfo(accountDetails.getUserInfo());
+ UserMoneyDetail userMoneyDetail = createHongBaoDeduct(hb, "鏂颁汉绾㈠寘鎵ｉ櫎");
+ userMoneyDetail.setId(accountDetails.getId());
+ return userMoneyDetail;
+ }
+
+ /**
+ * 鑰佺増鏈敭鍚庤鍗曟墸娆�
+ *
+ * @param accountDetails
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createOldWeiQuan(AccountDetails accountDetails) throws UserMoneyDetailException {
+ if (accountDetails == null)
+ throw new UserMoneyDetailException(1, "璇︽儏涓嶈兘涓虹┖");
+ if (accountDetails.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "鐢ㄦ埛涓嶈兘涓虹┖");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.weiQuan.name() + "-" + accountDetails.getId()));
+ detail.setMoney(new BigDecimal(accountDetails.getMoney()));
+ detail.setTitle(UserMoneyDetailTypeEnum.weiQuan.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.weiQuan);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(accountDetails.getUserInfo());
+ detail.setId(accountDetails.getId());
+ return detail;
+ }
+
+ /**
+ * 鏂颁汉绾㈠寘
+ *
+ * @param accountDetails
+ * @return
+ * @throws UserMoneyDetailException
+ */
+
+ public static UserMoneyDetail createOldNewerHongBao(AccountDetails accountDetails) throws UserMoneyDetailException {
+
+ if (accountDetails == null)
+ throw new UserMoneyDetailException(1, "璇︽儏涓嶈兘涓虹┖");
+ if (accountDetails.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "鐢ㄦ埛涓嶈兘涓虹┖");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(StringUtil
+ .Md5(UserMoneyDetailTypeEnum.hongbao.name() + "-" + "鑰佺増鏈柊浜虹孩鍖�" + "-" + accountDetails.getId()));
+ detail.setMoney(new BigDecimal(accountDetails.getMoney()));
+ detail.setTitle(UserMoneyDetailTypeEnum.hongbao.getDesc());
+ detail.setSubTitle("鏂颁汉绾㈠寘");
+ detail.setType(UserMoneyDetailTypeEnum.hongbao);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(accountDetails.getUserInfo());
+ detail.setId(accountDetails.getId());
+ return detail;
+ }
+
+ /**
+ * 鑰佺増鏈彁鐜拌处鍙烽獙璇�
+ *
+ * @param accountDetails
+ * @return
+ * @throws UserMoneyDetailException
+ */
+ public static UserMoneyDetail createOldExtractAccountValid(AccountDetails accountDetails)
+ throws UserMoneyDetailException {
+
+ if (accountDetails == null)
+ throw new UserMoneyDetailException(1, "楠岃瘉璁板綍涓嶈兘涓虹┖");
+ if (accountDetails.getUserInfo() == null)
+ throw new UserMoneyDetailException(1, "UID涓嶈兘涓虹┖");
+ if (accountDetails.getMoney() == null)
+ throw new UserMoneyDetailException(1, "閲戦涓嶈兘涓虹┖");
+
+ UserMoneyDetail detail = new UserMoneyDetail();
+ detail.setCreateTime(new Date());
+ detail.setIdentifyCode(StringUtil
+ .Md5(UserMoneyDetailTypeEnum.extractVerify.name() + "-" + "鑰佺増鏈�" + "-" + accountDetails.getId()));
+ detail.setMoney(new BigDecimal(accountDetails.getMoney()));
+ detail.setTitle(UserMoneyDetailTypeEnum.extractVerify.getDesc());
+ detail.setType(UserMoneyDetailTypeEnum.extractVerify);
+ detail.setUpdateTime(new Date());
+ detail.setUserInfo(accountDetails.getUserInfo());
+ detail.setId(accountDetails.getId());
+ return detail;
+ }
+
}
--
Gitblit v1.8.0