From 061e912ff3cec51f8f8dcb4e6336bcd2fc03c164 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 28 四月 2020 17:53:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 407 ++++++++++++++++++---------------------------------------
1 files changed, 128 insertions(+), 279 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 b8074d4..0c5f661 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
@@ -2,7 +2,6 @@
import java.math.BigDecimal;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -11,15 +10,11 @@
import com.google.gson.Gson;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;
-import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail.MsgTypeOrderTypeEnum;
import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;
import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.ExtractWeiXinRecord;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVO;
import com.yeshi.fanli.vo.msg.CommonMsgItemVOFactory;
@@ -46,9 +41,9 @@
new ClientTextStyleVO(String.format("鏀粯瀹�:%s-濮撳悕:%s",account, name), ClientTextStyleVO.COLOR_CONTENT)));
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("楼" + extract.getMoney().setScale(2), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("楼" + extract.getMoney().setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
if (!StringUtil.isNullOrEmpty(alipayNo)) {
- contentList.add(new ClientTextStyleVO(String.format("&鏀粯瀹濊鍗曞彿锛� %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(String.format("&鏀粯瀹濊鍗曞彿: %s", "*" + alipayNo.substring(alipayNo.length() - 10)), ClientTextStyleVO.COLOR_CONTENT));
}
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愮幇閲戦", ClientTextStyleVO.COLOR_TITLE),contentList));
@@ -103,9 +98,14 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(String.format("鏀粯瀹�:%s-濮撳悕:%s",account, name), ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎵撴閲戦", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(money + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)));
- listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(String.format("鎻愮幇璐﹀彿鏀跺埌涓�绗旓紝鏉ヨ嚜%s鐨勮浆璐︼紝鍗崇粦瀹氭垚鍔�", appName), ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT)));
+
+ List<ClientTextStyleVO> contentList2 = new ArrayList<>();
+ contentList2.add(new ClientTextStyleVO("鎻愮幇璐﹀彿鏀跺埌涓�绗旓紝鏉ヨ嚜", ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO(appName, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList2.add(new ClientTextStyleVO("鐨勮浆璐︼紝鍗崇粦瀹氭垚鍔�", ClientTextStyleVO.COLOR_CONTENT));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璇存槑", ClientTextStyleVO.COLOR_TITLE),contentList2));
+
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO(String.format("鎴愬姛%s鐨勬彁鐜拌处鍙�", changeWay), ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO( limitDay+"", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
@@ -142,14 +142,12 @@
if (change) {
changeWay = "淇敼";
}
- String name = filterName(valid.getName());
- String account = filterAccount(valid.getAccount());
List<CommonMsgItemVO> listMsg = new ArrayList<>();
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("楠岃瘉鐘舵��", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(String.format("鎻愮幇璐﹀彿%s澶辫触", changeWay), ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鎻愮幇璐﹀彿", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(String.format("鏀粯瀹�:%s-濮撳悕:%s",account, name), ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO(String.format("鏀粯瀹�:%s-濮撳悕:%s",valid.getAccount(), valid.getName()), ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍘熷洜", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("璇蜂粩缁嗘牳瀵瑰～鍐欒处鍙锋槸鍚︽湁璇垨璺濅笂涓�娆′慨鏀规椂闀挎槸鍚﹁秴杩�30澶�", ClientTextStyleVO.COLOR_CONTENT)));
@@ -188,24 +186,13 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createOrderReceivedMsg(BigDecimal money, BigDecimal balance, String orderId, int source,
- int goodsCount, Long uid, int type, Date downTime, boolean useCoupon) {
+ public static MsgMoneyDetail fanLiOrderReceivedMsg(BigDecimal money, BigDecimal balance, String orderId, int source,
+ int goodsCount, Long uid, Date downTime, boolean useCoupon) {
if (money == null || balance == null || orderId == null || uid == null)
return null;
- String fanliName = "";
- MsgTypeMoneyTypeEnum typeEnum = null;
- String sourceName = Constant.getSourceName(source);
- if (Constant.TYPE_REBATE == type) {
- fanliName = "鑷喘杩斿埄";
- sourceName += "-杩斿埄璁㈠崟";
- typeEnum = MsgTypeMoneyTypeEnum.fanli;
- } else if (Constant.TYPE_SHAER == type) {
- fanliName = "鍒嗕韩濂栭噾锛�";
- sourceName += "-鍒嗕韩璁㈠崟";
- typeEnum = MsgTypeMoneyTypeEnum.share;
- }
-
+ String fanliName = "鑷喘杩斿埄";
+ String sourceName = Constant.getSourceName(source) + "-杩斿埄璁㈠崟";
if (useCoupon) {
fanliName = "浣跨敤杩斿埄濂栧姳鍒�";
}
@@ -214,20 +201,23 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处璇︽儏", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
+ new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("涓嬪崟鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO(TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)));
+
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("鍏�", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT));
- listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE), contentList));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", ClientTextStyleVO.COLOR_TITLE), contentList));
+
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处绫荤洰", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(fanliName, ClientTextStyleVO.COLOR_CONTENT)));
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
- contentList2.add(new ClientTextStyleVO("楼" + money, ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList2.add(new ClientTextStyleVO("锛堣处鎴蜂綑棰澛ワ級"+ balance, ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList2.add(new ClientTextStyleVO("锛堣处鎴蜂綑棰澛�"+ balance.setScale(2, BigDecimal.ROUND_DOWN) + "锛�", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处閲戦", ClientTextStyleVO.COLOR_TITLE), contentList2));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
@@ -237,7 +227,7 @@
detail.setCreateTime(new Date());
detail.setGoodsCount(goodsCount);
detail.setMoney(money);
- detail.setMsgType(typeEnum);
+ detail.setMsgType(MsgTypeMoneyTypeEnum.fanli);
detail.setOrderId(orderId);
detail.setOrderType(source);
detail.setRead(false);
@@ -246,6 +236,58 @@
return detail;
}
+
+
+ /**
+ * 杩斿埄鍒拌处
+ *
+ * @param money
+ * @param balance
+ * @param orderId
+ * @param goodsCount
+ * @param uid
+ * @param beiZhu
+ * @return
+ */
+ public static MsgMoneyDetail shareOrderReceivedMsg(BigDecimal money, BigDecimal balance, int source, Long uid, Date receivedDate) {
+ if (money == null || balance == null || uid == null)
+ return null;
+
+ String sourceName = Constant.getSourceName(source) + "-鍒嗕韩璁㈠崟";
+ List<CommonMsgItemVO> listMsg = new ArrayList<>();
+
+ List<ClientTextStyleVO> contentList = new ArrayList<>();
+ contentList.add(new ClientTextStyleVO(TimeUtil.getYearOnlyYYYY(receivedDate)+ "骞�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO(TimeUtil.getMonthOnlyMM(receivedDate), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList.add(new ClientTextStyleVO("鏈�", ClientTextStyleVO.COLOR_CONTENT));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("缁撶畻鏈堝害", ClientTextStyleVO.COLOR_TITLE), contentList));
+
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处璇︽儏", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));
+
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处绫荤洰", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("鍒嗕韩濂栭噾", ClientTextStyleVO.COLOR_CONTENT)));
+
+ List<ClientTextStyleVO> contentList2 = new ArrayList<>();
+ contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList2.add(new ClientTextStyleVO("锛堣处鎴蜂綑棰澛�"+ balance.setScale(2, BigDecimal.ROUND_DOWN) + "锛�", ClientTextStyleVO.COLOR_CONTENT));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处閲戦", ClientTextStyleVO.COLOR_TITLE), contentList2));
+
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
+
+ MsgMoneyDetail detail = new MsgMoneyDetail();
+ detail.setBalance(balance);
+ detail.setCreateTime(new Date());
+ detail.setMoney(money);
+ detail.setMsgType(MsgTypeMoneyTypeEnum.share);
+ detail.setOrderType(source);
+ detail.setRead(false);
+ detail.setUser(new UserInfo(uid));
+ detail.setExtraInfo(new Gson().toJson(listMsg));
+ return detail;
+ }
+
/**
* 杩斿埄缁存潈
*
@@ -282,21 +324,23 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閫�鍥炶鎯�", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(sourceName, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鍙�", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
+ new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT)));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("涓嬪崟鏃堕棿", ClientTextStyleVO.COLOR_TITLE),
+ new ClientTextStyleVO(TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT)));
+
List<ClientTextStyleVO> contentList = new ArrayList<>();
- contentList.add(new ClientTextStyleVO("涓嬪崟鏃堕棿锛�" + TimeUtil.formatDate(downTime), ClientTextStyleVO.COLOR_CONTENT));
- contentList.add(new ClientTextStyleVO("-鍟嗗搧鏁伴噺锛氬叡", ClientTextStyleVO.COLOR_CONTENT));
+ contentList.add(new ClientTextStyleVO("鍏�", ClientTextStyleVO.COLOR_CONTENT));
contentList.add(new ClientTextStyleVO(goodsCount + "", ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList.add(new ClientTextStyleVO("浠跺晢鍝�", ClientTextStyleVO.COLOR_CONTENT));
- listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("璁㈠崟鐩稿叧", ClientTextStyleVO.COLOR_TITLE), contentList));
+ listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍟嗗搧鏁伴噺", ClientTextStyleVO.COLOR_TITLE), contentList));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閫�鍥炲師鍥�", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO(weiquan, ClientTextStyleVO.COLOR_CONTENT)));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处閲戦", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO("楼" +fanliMoney.setScale(2) + "锛堝師鍒拌处閲戦锛�", ClientTextStyleVO.COLOR_CONTENT)));
+ new ClientTextStyleVO("楼" +fanliMoney.setScale(2, BigDecimal.ROUND_DOWN) + "锛堝師鍒拌处閲戦锛�", ClientTextStyleVO.COLOR_CONTENT)));
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
- contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
contentList2.add(new ClientTextStyleVO("锛�"+ weiquanMoney + "锛�", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("閫�鍥為噾棰�", ClientTextStyleVO.COLOR_TITLE), contentList2));
@@ -327,7 +371,8 @@
* @param beiZhu
* @return
*/
- public static MsgMoneyDetail createTeamReceivedMsg(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) {
+ public static MsgMoneyDetail createTeamReceivedMsg(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate,
+ String teamName) {
if (money == null || balance == null || uid == null)
return null;
@@ -339,11 +384,11 @@
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("缁撶畻鏈堝害", ClientTextStyleVO.COLOR_TITLE), contentList));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处绫荤洰", ClientTextStyleVO.COLOR_TITLE),
- new ClientTextStyleVO("鍥㈤槦鏀剁泭", ClientTextStyleVO.COLOR_CONTENT), true));
+ new ClientTextStyleVO(teamName, ClientTextStyleVO.COLOR_CONTENT)));
List<ClientTextStyleVO> contentList2 = new ArrayList<>();
- contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
- contentList2.add(new ClientTextStyleVO("锛堣处鎴蜂綑棰澛� "+ balance.setScale(2)+"锛�", ClientTextStyleVO.COLOR_CONTENT));
+ contentList2.add(new ClientTextStyleVO("楼" + money.setScale(2, BigDecimal.ROUND_DOWN), ClientTextStyleVO.COLOR_HIGHLIGHT_CONTENT));
+ contentList2.add(new ClientTextStyleVO("锛堣处鎴蜂綑棰澛� "+ balance.setScale(2, BigDecimal.ROUND_DOWN)+"锛�", ClientTextStyleVO.COLOR_CONTENT));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("鍒拌处閲戦", ClientTextStyleVO.COLOR_TITLE), contentList2));
listMsg.add(CommonMsgItemVOFactory.createMsgItemVO(new ClientTextStyleVO("澶囨敞", ClientTextStyleVO.COLOR_TITLE),
new ClientTextStyleVO("濡傛湁鐤戦棶璇疯仈绯讳汉宸ュ鏈�", ClientTextStyleVO.COLOR_CONTENT)));
@@ -359,237 +404,6 @@
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;
- }
-
- /**
- * 鍒嗕韩璧氬埌璐�
- *
- * @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;
- }
-
-
- /**
- * 绾㈠寘鐩稿叧淇℃伅
- * @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;
- }
-
-
private static String filterName(String oldname) {
String name = "";
@@ -628,14 +442,14 @@
} else {// 鍏朵粬
if (alipayAccount.length() >= 6) {
for (int i = 0; i < alipayAccount.length(); i++) {
- if (i < 3 || i >= alipayAccount.length() - 2)
+ if (i < alipayAccount.length() - 4)
account += alipayAccount.charAt(i);
else
account += "*";
}
} else {
for (int i = 0; i < alipayAccount.length(); i++) {
- if (i < 1 || i >= alipayAccount.length() - 1)
+ if (i < alipayAccount.length() - 1)
account += alipayAccount.charAt(i);
else
account += "*";
@@ -646,9 +460,44 @@
}
+ /**
+ * 绾㈠寘鐩稿叧淇℃伅
+ * @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;
+ }
-
+ 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