From a481da100d823bdebc63ddd11ba23da2f84c38ca Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 21 八月 2019 10:43:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 156 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 140 insertions(+), 16 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 30a8c76..35bab27 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( 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;
}
@@ -54,6 +54,7 @@
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( 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;
}
@@ -88,17 +90,16 @@
* @return
*/
public static MsgMoneyDetail createAlipayAccountValidMsg(AlipayAccountValidNormalHistory valid, Long uid,
- String company, BigDecimal money, String beiZhu) {
- if (valid == null || uid == null || company == null)
+ String appName, BigDecimal money, String beiZhu) {
+ if (valid == null || uid == null || appName == null)
return null;
MsgMoneyDetail detail = new MsgMoneyDetail();
detail.setAlipayAccountValid(valid);
- detail.setBeiZhu( beiZhu);
+ detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
detail.setMoney(money);
- detail.setStateDesc(String
- .format("宸插悜浣犵殑鎻愮幇鏀粯瀹濊浆鍏ヤ竴绗旀潵鑷簬鈥�%s鈥濇�婚涓�%s鍏冪殑杞处锛屾敹鍒板嵆鎻愮幇甯愬彿楠岃瘉鎴愬姛銆�", company, MoneyBigDecimalUtil.getWithNoZera(money))
- .toString());
+ detail.setStateDesc(String.format("浣犵殑鏀粯瀹濆皢鏀跺埌涓�绗旓紝鐞嗙敱\"鏉ヨ嚜浜�%s鐨勬敮浠樺疂楠岃瘉鎵撴\"鍜屽鏂硅处鎴穃"%s鏀粯瀹濋獙璇乗"鐨�%s鍏冭浆璐︺��", appName, appName,
+ MoneyBigDecimalUtil.getWithNoZera(money)).toString());
detail.setMsgType(MsgTypeMoneyTypeEnum.extractValid);
detail.setRead(false);
detail.setUser(new UserInfo(uid));
@@ -116,8 +117,8 @@
* @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;
@@ -129,6 +130,36 @@
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,8 +177,8 @@
* @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;
@@ -161,6 +192,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 +237,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( 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 +257,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