From 4637d6f780c76f1c5a0f95922c658efe8174be8f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 18:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 402 ++++++++++++++++++++++++++-------------------------------
1 files changed, 184 insertions(+), 218 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..42ccb72 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
@@ -11,15 +11,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;
@@ -48,7 +44,7 @@
List<ClientTextStyleVO> contentList = new ArrayList<>();
contentList.add(new ClientTextStyleVO("楼" + extract.getMoney().setScale(2), 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));
@@ -201,7 +197,7 @@
sourceName += "-杩斿埄璁㈠崟";
typeEnum = MsgTypeMoneyTypeEnum.fanli;
} else if (Constant.TYPE_SHAER == type) {
- fanliName = "鍒嗕韩濂栭噾锛�";
+ fanliName = "鍒嗕韩濂栭噾:";
sourceName += "-鍒嗕韩璁㈠崟";
typeEnum = MsgTypeMoneyTypeEnum.share;
}
@@ -217,8 +213,8 @@
new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
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("涓嬪崟鏃堕棿:" + TimeUtil.formatDate(downTime), 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));
@@ -285,8 +281,8 @@
new ClientTextStyleVO(orderId, ClientTextStyleVO.COLOR_CONTENT), true));
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("涓嬪崟鏃堕棿:" + TimeUtil.formatDate(downTime), 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));
@@ -359,215 +355,185 @@
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;
+// /**
+// * 閭�璇疯禋缁存潈
+// *
+// * @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;
+// }
+//
+//
+//
- 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;
- }
-
-
+//
+// /**
+// * 鍥㈤槦濂栧姳
+// * @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
--
Gitblit v1.8.0