From 03afbcf4b9e9b55433e914d861d643b7a23d69f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 25 二月 2019 15:37:27 +0800
Subject: [PATCH] 返利奖励图标更改
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 110 insertions(+), 8 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..80548c8 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
@@ -123,11 +125,39 @@
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.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, 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.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -153,12 +183,40 @@
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.invite);
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 createInviteWeiQuanMsg(Long uid, String orderId, 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));
@@ -183,7 +241,7 @@
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);
@@ -195,4 +253,48 @@
return detail;
}
+ /**
+ * 鍒嗕韩璧氱淮鏉�
+ *
+ * @param uid
+ * @param orderId
+ * @param money
+ * @param balance
+ * @param beiZhu
+ * @return
+ */
+ public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId, 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));
+ return detail;
+ }
+
+
+ public static MsgMoneyDetail createOrderRewardMsg(Long uid, String orderId, 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.setUser(new UserInfo(uid));
+ return detail;
+ }
+
}
--
Gitblit v1.8.0