From a56bd9db6b5c989fb2eaecd3a854ac6782b55f95 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 26 十月 2019 14:44:19 +0800 Subject: [PATCH] 淘宝维权退款服务修改 --- fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgMoneyDetailFactory.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 50 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 0aace0a..205bc1a 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 @@ -7,6 +7,7 @@ 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; @@ -59,6 +60,32 @@ } /** + * 鑷姩鎻愮幇 + * + * @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; + } + + + /** * 鎻愮幇澶辫触娑堟伅 * * @param extract @@ -90,17 +117,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.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)); @@ -268,7 +294,7 @@ * @param beiZhu * @return */ - public static MsgMoneyDetail createShareWeiQuanMsg(Long uid, String orderId,int orderType, BigDecimal money, + 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; @@ -319,5 +345,23 @@ 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; + } } -- Gitblit v1.8.0