From 184d1341ae248cf02a8225ca7bfbba463e18496e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 17:47:40 +0800
Subject: [PATCH] 消息

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java |  386 +++++++++++++++++++++++++-----------------------------
 1 files changed, 178 insertions(+), 208 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 6df0264..42ccb72 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
@@ -355,215 +355,185 @@
 		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;
+//	/**
+//	 * 閭�璇疯禋缁存潈
+//	 * 
+//	 * @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;
+//	}
+//	
+//	
+//
 
-		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;
-	}
-	
-	
-
-	/**
-	 * 閭�璇疯鍗曡ˉ璐�
-	 * 
-	 * @param uid
-	 * @param date
-	 * @param from
-	 * @param money
-	 * @param balance
-	 * @param beiZhu
-	 * @return
-	 */
-	public static MsgMoneyDetail createInviteOrderSubSidyMsg(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.subSidy);
-		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;
-	}
-	
-	/**
-	 * 鍥㈤槦濂栧姳
-	 * @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;
-	}
-	
-	
+//	
+//	/**
+//	 * 鍥㈤槦濂栧姳
+//	 * @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

--
Gitblit v1.8.0