From 245bf498b0b145b21b73cc73c77637c895528322 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 09:18:07 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 239 +++++++++--------------------------------------------------
1 files changed, 36 insertions(+), 203 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
index 42ccb72..3d95283 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java
@@ -2,7 +2,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -355,207 +354,6 @@
return detail;
}
-// /**
-// * 閭�璇疯禋缁存潈
-// *
-// * @param uid
-// * @param orderId
-// * @param money
-// * @param balance
-// * @param beiZhu
-// * @return
-// */
-// public static MsgMoneyDetail createInviteWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
-// BigDecimal balance, String beiZhu) {
-// if (money == null || orderId == null || money == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.inviteWeiQuan);
-// detail.setOrderId(orderId);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-// detail.setOrderType(orderType);
-//
-// return detail;
-// }
-//
-// /**
-// * 鍒嗕韩璧氬埌璐�
-// *
-// * @param money
-// * @param balance
-// * @param orderCount
-// * @param goodsCount
-// * @param uid
-// * @param beiZhu
-// * @return
-// */
-// public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderType, int orderCount,
-// int goodsCount, Long uid, String beiZhu) {
-// if (money == null || balance == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setGoodsCount(goodsCount);
-// detail.setOrderType(orderType);
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.share);
-// detail.setOrderCount(orderCount);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-//
-// return detail;
-// }
-//
-// /**
-// * 鍒嗕韩璧氱淮鏉�
-// *
-// * @param uid
-// * @param orderId
-// * @param money
-// * @param balance
-// * @param beiZhu
-// * @return
-// */
-// public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, int orderType, BigDecimal money,
-// BigDecimal balance, String beiZhu) {
-// if (money == null || orderId == null || money == null || uid == null)
-// return null;
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.shareWeiQuan);
-// detail.setOrderId(orderId);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-// detail.setOrderType(orderType);
-// return detail;
-// }
-//
-// public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, int orderType, BigDecimal money,
-// BigDecimal balance, String beiZhu) {
-// if (money == null || orderId == null || money == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.orderReward);
-// detail.setOrderId(orderId);
-// detail.setRead(false);
-// detail.setOrderType(orderType);
-// detail.setUser(new UserInfo(uid));
-// return detail;
-// }
-//
-// public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,
-// String beiZhu) {
-// if (money == null || money == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);
-// detail.setOrderId(reason);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-// return detail;
-// }
-//
-// public static MsgMoneyDetail createElmeFanliMsg(Long uid, String orderId, BigDecimal money, BigDecimal balance,
-// String beiZhu) {
-// if (money == null || money == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.fanliElme);
-// detail.setOrderId(orderId);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-// return detail;
-// }
-//
-//
-//
-
-//
-// /**
-// * 鍥㈤槦濂栧姳
-// * @Title: createOrderTeamRewardMsg
-// * @Description:
-// * @param uid
-// * @param date
-// * @param from
-// * @param money
-// * @param balance
-// * @param beiZhu
-// * @return
-// * MsgMoneyDetail 杩斿洖绫诲瀷
-// * @throws
-// */
-// public static MsgMoneyDetail createOrderTeamRewardMsg(Long uid, Date date, String from, BigDecimal money,
-// BigDecimal balance, String beiZhu) {
-// if (money == null || money == null || uid == null)
-// return null;
-//
-// MsgMoneyDetail detail = new MsgMoneyDetail();
-// detail.setBalance(balance);
-// detail.setBeiZhu(beiZhu);
-// detail.setCreateTime(new Date());
-// detail.setMoney(money);
-// detail.setMsgType(MsgTypeMoneyTypeEnum.orderTeamReward);
-// detail.setRead(false);
-// detail.setUser(new UserInfo(uid));
-// Calendar calendar = Calendar.getInstance();
-// calendar.setTime(date);
-// detail.setStateDesc(String.format("%s骞�%s鏈堝洟闃熷鍔卞埌璐�", calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH)));
-// detail.setDesc(from);
-//
-// return detail;
-// }
-//
-//
- /**
- * 绾㈠寘鐩稿叧淇℃伅
- * @param uid
- * @param type
- * @param content
- * @param beiZhu
- * @return
- */
- public static MsgMoneyDetail createRedPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) {
- if (uid == null || type == null || StringUtil.isNullOrEmpty(content))
- return null;
- MsgMoneyDetail detail = new MsgMoneyDetail();
- detail.setUser(new UserInfo(uid));
- detail.setRead(false);
- detail.setContent(content);
- detail.setMsgType(type);
- detail.setBeiZhu(beiZhu);
- detail.setCreateTime(new Date());
- return detail;
- }
-
-
private static String filterName(String oldname) {
String name = "";
@@ -612,9 +410,44 @@
}
+ /**
+ * 绾㈠寘鐩稿叧淇℃伅
+ * @param uid
+ * @param type
+ * @param content
+ * @param beiZhu
+ * @return
+ */
+ public static MsgMoneyDetail createRedPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) {
+ if (uid == null || type == null || StringUtil.isNullOrEmpty(content))
+ return null;
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setUser(new UserInfo(uid));
+ detail.setRead(false);
+ detail.setContent(content);
+ detail.setMsgType(type);
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ return detail;
+ }
-
+ public static MsgMoneyDetail createSystemEqualizeMsg(Long uid, String reason, BigDecimal money, BigDecimal balance,
+ String beiZhu) {
+ if (money == null || money == null || uid == null)
+ return null;
+
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setBalance(balance);
+ detail.setBeiZhu(beiZhu);
+ detail.setCreateTime(new Date());
+ detail.setMoney(money);
+ detail.setMsgType(MsgTypeMoneyTypeEnum.systemEqualize);
+ detail.setOrderId(reason);
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ return detail;
+ }
}
--
Gitblit v1.8.0