From 393e3a365b5ebbed6e9eef07fbd18881cde73711 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 28 三月 2020 16:51:04 +0800
Subject: [PATCH] Merge branch 'div' into div-1
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 104 +++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 98 insertions(+), 6 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 205bc1a..2356266 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
@@ -1,7 +1,10 @@
package com.yeshi.fanli.util.factory.msg;
import java.math.BigDecimal;
+import java.util.Calendar;
import java.util.Date;
+
+import org.yeshi.utils.StringUtil;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
@@ -60,15 +63,15 @@
}
/**
- * 鑷姩鎻愮幇
+ * 鑷姩鎻愮幇
*
* @param extract
* @param uid
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc,
- String desc, String beiZhu) {
+ public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc, String desc,
+ String beiZhu) {
if (extractRecord == null)
return null;
MsgMoneyDetail detail = new MsgMoneyDetail();
@@ -84,7 +87,6 @@
return detail;
}
-
/**
* 鎻愮幇澶辫触娑堟伅
*
@@ -345,8 +347,7 @@
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)
@@ -363,5 +364,96 @@
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;
+ }
+
+
+ /**
+ * 绾㈠寘鐩稿叧淇℃伅
+ * @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;
+ }
}
--
Gitblit v1.8.0