From a3ea58065f61d16f06a0883737eae320eef5c33a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 01 八月 2019 15:47:12 +0800
Subject: [PATCH] 非任务模式不执行京东/拼多多订单

---
 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java |  153 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 139 insertions(+), 14 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 d2a1ead..0aace0a 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
@@ -9,7 +9,6 @@
 import com.yeshi.fanli.entity.bus.user.Extract;
 import com.yeshi.fanli.entity.bus.user.UserInfo;
 import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.StringUtil;
 
 public class MsgMoneyDetailFactory {
 
@@ -25,13 +24,14 @@
 		if (extract == null || uid == null)
 			return null;
 		MsgMoneyDetail detail = new MsgMoneyDetail();
-		detail.setBeiZhu(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setExtract(extract);
 		detail.setMoney(extract.getMoney());
 		detail.setMsgType(MsgTypeMoneyTypeEnum.extract);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setStateDesc("浜哄伐瀹℃牳涓�");
 		return detail;
 	}
 
@@ -47,13 +47,14 @@
 		if (extract == null || uid == null)
 			return null;
 		MsgMoneyDetail detail = new MsgMoneyDetail();
-		detail.setBeiZhu(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setExtract(extract);
 		detail.setMoney(extract.getMoney());
 		detail.setMsgType(MsgTypeMoneyTypeEnum.extract);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setStateDesc("鎻愮幇鎴愬姛");
 		return detail;
 	}
 
@@ -69,13 +70,14 @@
 		if (extract == null || uid == null)
 			return null;
 		MsgMoneyDetail detail = new MsgMoneyDetail();
-		detail.setBeiZhu(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setExtract(extract);
 		detail.setMoney(extract.getMoney());
 		detail.setMsgType(MsgTypeMoneyTypeEnum.extract);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setStateDesc("鎻愮幇澶辫触");
 		return detail;
 	}
 
@@ -93,7 +95,7 @@
 			return null;
 		MsgMoneyDetail detail = new MsgMoneyDetail();
 		detail.setAlipayAccountValid(valid);
-		detail.setBeiZhu(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setMoney(money);
 		detail.setStateDesc(String
@@ -116,19 +118,49 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int goodsCount,
-			Long uid, String beiZhu) {
+	public static MsgMoneyDetail createFailiMsg(BigDecimal money, BigDecimal balance, String orderId, int orderType,
+			int goodsCount, Long uid, String beiZhu) {
 		if (money == null || balance == null || orderId == null || uid == null)
 			return null;
 
 		MsgMoneyDetail detail = new MsgMoneyDetail();
 		detail.setBalance(balance);
-		detail.setBeiZhu(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setGoodsCount(goodsCount);
 		detail.setMoney(money);
 		detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);
 		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
+		detail.setRead(false);
+		detail.setUser(new UserInfo(uid));
+
+		return detail;
+	}
+
+	/**
+	 * 杩斿埄缁存潈
+	 * 
+	 * @param uid
+	 * @param orderId
+	 * @param money
+	 * @param balance
+	 * @param beiZhu
+	 * @return
+	 */
+	public static MsgMoneyDetail createFailiWeiQuanMsg(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.fanliWeiQuan);
+		detail.setOrderId(orderId);
+		detail.setOrderType(orderType);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
 
@@ -146,14 +178,14 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createInviteMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
-			Long uid, String beiZhu) {
+	public static MsgMoneyDetail createInviteMsg(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(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setGoodsCount(goodsCount);
 		detail.setMoney(money);
@@ -161,6 +193,36 @@
 		detail.setOrderCount(orderCount);
 		detail.setRead(false);
 		detail.setUser(new UserInfo(uid));
+		detail.setOrderType(orderType);
+
+		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;
 	}
@@ -176,16 +238,17 @@
 	 * @param beiZhu
 	 * @return
 	 */
-	public static MsgMoneyDetail createShareMsg(BigDecimal money, BigDecimal balance, int orderCount, int goodsCount,
-			Long uid, String beiZhu) {
+	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(StringUtil.isNullOrEmpty(beiZhu) ? "鏃�" : beiZhu);
+		detail.setBeiZhu(beiZhu);
 		detail.setCreateTime(new Date());
 		detail.setGoodsCount(goodsCount);
+		detail.setOrderType(orderType);
 		detail.setMoney(money);
 		detail.setMsgType(MsgTypeMoneyTypeEnum.share);
 		detail.setOrderCount(orderCount);
@@ -195,4 +258,66 @@
 		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;
+	}
+
 }

--
Gitblit v1.8.0