From cd4d7c2ff85d68aebec276073020224b5de56415 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 十一月 2019 10:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 100 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java
index c8f2667..29291de 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java
@@ -7,6 +7,7 @@
import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;
import com.yeshi.fanli.entity.redpack.RedPackExchange;
import com.yeshi.fanli.entity.redpack.RedPackGiveRecord;
+import com.yeshi.fanli.entity.redpack.RedPackWinInvite;
import com.yeshi.fanli.exception.redpack.RedPackDetailException;
import com.yeshi.fanli.util.StringUtil;
@@ -24,7 +25,7 @@
RedPackDetail detail = new RedPackDetail();
detail.setDisplay(false);
- detail.setDesc("绛夊緟浜哄伐瀹℃牳");
+ detail.setDescInfo( "绛夊緟浜哄伐瀹℃牳");
detail.setUid(exchange.getUid());
detail.setMoney(new BigDecimal("-" + exchange.getMoney()));
detail.setType(RedPackDetailTypeEnum.redExchange);
@@ -50,7 +51,7 @@
RedPackDetail detail = new RedPackDetail();
detail.setId(id);
detail.setDisplay(true);
- detail.setDesc("璇峰埌璐︽埛浣欓涓煡鐪�");
+ detail.setDescInfo("璇峰埌璐︽埛浣欓涓煡鐪�");
detail.setType(RedPackDetailTypeEnum.redExchangePass);
detail.setTitle(RedPackDetailTypeEnum.redExchangePass.getDesc());
detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.redExchangePass.name() + ":" + exchange.getId()));
@@ -72,7 +73,7 @@
detail.setDisplay(false);
detail.setUid(exchange.getUid());
detail.setMoney(exchange.getMoney());
- detail.setDesc("绾㈠寘浜х敓杩囩▼涓秹瀚岃繚瑙�");
+ detail.setDescInfo("绾㈠寘浜х敓杩囩▼涓秹瀚岃繚瑙�");
detail.setTitle(RedPackDetailTypeEnum.redExchangeReject.getDesc());
detail.setType(RedPackDetailTypeEnum.redExchangeReject);
detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.redExchangeReject.name() + ":" + exchange.getId()));
@@ -187,7 +188,101 @@
detail.setTitle(title);
detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.useByShopOrder.name() + "-" + orderId));
detail.setCreateTime(new Date());
- detail.setDesc(setName);
+ detail.setDescInfo(setName);
+ return detail;
+ }
+
+
+ /**
+ * 鏂颁汉濂栧姳
+ * @param winInvite
+ * @return
+ * @throws RedPackDetailException
+ */
+ public static RedPackDetail createNewUserReward(RedPackWinInvite winInvite) throws RedPackDetailException {
+ if (winInvite == null)
+ throw new RedPackDetailException(1, "鑾峰緱璁板綍涓嶈兘涓虹┖");
+
+ // 绾㈠寘鏄庣粏- 閫�鍥炵孩鍖�
+ RedPackDetail detail = new RedPackDetail();
+ detail.setDisplay(true);
+ detail.setUid(winInvite.getUid());
+ detail.setMoney(winInvite.getMoney());
+ detail.setDescInfo("瀹屾垚棣栫瑪璁㈠崟");
+ detail.setTitle(RedPackDetailTypeEnum.newUserReward.getDesc());
+ detail.setType(RedPackDetailTypeEnum.newUserReward);
+ detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.newUserReward.name() + ":" + winInvite.getId()));
+ detail.setCreateTime(new Date());
+ return detail;
+ }
+
+ /**
+ * 绔嬪緱鐜伴噾
+ * @param winInvite
+ * @return
+ * @throws RedPackDetailException
+ */
+ public static RedPackDetail createInvite(RedPackWinInvite winInvite) throws RedPackDetailException {
+ if (winInvite == null)
+ throw new RedPackDetailException(1, "鑾峰緱璁板綍涓嶈兘涓虹┖");
+
+ // 绾㈠寘鏄庣粏- 閫�鍥炵孩鍖�
+ RedPackDetail detail = new RedPackDetail();
+ detail.setDisplay(true);
+ detail.setUid(winInvite.getUid());
+ detail.setMoney(winInvite.getMoney());
+ detail.setDescInfo("鎴愬姛閭�璇峰ソ鍙�");
+ detail.setTitle(RedPackDetailTypeEnum.invite.getDesc());
+ detail.setType(RedPackDetailTypeEnum.invite);
+ detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.invite.name() + ":" + winInvite.getId()));
+ detail.setCreateTime(new Date());
+ return detail;
+ }
+
+ /**
+ * 閫掑濂栧姳 + 濂藉弸瀹屾垚鍒嗕韩璁㈠崟
+ * @param winInvite
+ * @return
+ * @throws RedPackDetailException
+ */
+ public static RedPackDetail createIncreaseReward(RedPackWinInvite winInvite) throws RedPackDetailException {
+ if (winInvite == null)
+ throw new RedPackDetailException(1, "鑾峰緱璁板綍涓嶈兘涓虹┖");
+
+ // 绾㈠寘鏄庣粏- 閫�鍥炵孩鍖�
+ RedPackDetail detail = new RedPackDetail();
+ detail.setDisplay(true);
+ detail.setUid(winInvite.getUid());
+ detail.setMoney(winInvite.getMoney());
+ detail.setDescInfo("濂藉弸瀹屾垚璁㈠崟");
+ detail.setTitle(RedPackDetailTypeEnum.increaseReward.getDesc());
+ detail.setType(RedPackDetailTypeEnum.increaseReward);
+ detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.increaseReward.name() + ":" + winInvite.getId()));
+ detail.setCreateTime(new Date());
+ return detail;
+ }
+
+
+ /**
+ * 杩炵画濂栧姳 + 濂藉弸瀹屾垚鍒嗕韩璁㈠崟
+ * @param winInvite
+ * @return
+ * @throws RedPackDetailException
+ */
+ public static RedPackDetail createSeriesReward(RedPackWinInvite winInvite) throws RedPackDetailException {
+ if (winInvite == null)
+ throw new RedPackDetailException(1, "鑾峰緱璁板綍涓嶈兘涓虹┖");
+
+ // 绾㈠寘鏄庣粏- 閫�鍥炵孩鍖�
+ RedPackDetail detail = new RedPackDetail();
+ detail.setDisplay(true);
+ detail.setUid(winInvite.getUid());
+ detail.setMoney(winInvite.getMoney());
+ detail.setDescInfo("濂藉弸瀹屾垚璁㈠崟");
+ detail.setTitle(RedPackDetailTypeEnum.seriesReward.getDesc());
+ detail.setType(RedPackDetailTypeEnum.seriesReward);
+ detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.seriesReward.name() + ":" + winInvite.getId()));
+ detail.setCreateTime(new Date());
return detail;
}
@@ -206,9 +301,8 @@
detail.setTitle(title);
detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.shopOrderDrawBack.name() + "-" + orderId));
detail.setCreateTime(new Date());
- detail.setDesc(setName);
+ detail.setDescInfo(setName);
return detail;
}
-
}
--
Gitblit v1.8.0