From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 12 十二月 2019 14:18:11 +0800 Subject: [PATCH] 订单补贴消息修改 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 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 35bab27..dea66c7 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,12 +1,16 @@ 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; 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.MoneyBigDecimalUtil; @@ -55,6 +59,31 @@ detail.setRead(false); detail.setUser(new UserInfo(uid)); detail.setStateDesc("鎻愮幇鎴愬姛"); + return detail; + } + + /** + * 鑷姩鎻愮幇 + * + * @param extract + * @param uid + * @param beiZhu + * @return + */ + public static MsgMoneyDetail createExtractAutoMsg(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, + String beiZhu) { + if (extractRecord == null) + return null; + MsgMoneyDetail detail = new MsgMoneyDetail(); + detail.setUser(new UserInfo(extractRecord.getUid())); + detail.setRead(false); + detail.setMoney(extractRecord.getMoney()); + detail.setMsgType(MsgTypeMoneyTypeEnum.extractAutoWX); + detail.setExtract(new Extract(extractRecord.getId())); + detail.setStateDesc(stateDesc); + detail.setDesc(desc); + detail.setBeiZhu(beiZhu); + detail.setCreateTime(new Date()); return detail; } @@ -319,4 +348,77 @@ 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; + } + + + /** + * 绾㈠寘鐩稿叧淇℃伅 + * @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