From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 15 四月 2020 10:22:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 208 +++++++++++++++++++++------------------------------ 1 files changed, 85 insertions(+), 123 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java index 8522d24..5772b95 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java @@ -5,7 +5,6 @@ import javax.annotation.Resource; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import com.yeshi.fanli.dto.push.PushContentDTO; @@ -13,13 +12,13 @@ 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.entity.config.push.PushMsgFactory; import com.yeshi.fanli.exception.msg.MsgMoneyDetailException; import com.yeshi.fanli.exception.push.PushException; import com.yeshi.fanli.service.inter.money.msg.MsgMoneyDetailService; import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService; +import com.yeshi.fanli.service.inter.msg.MsgExtraService; import com.yeshi.fanli.service.inter.push.PushService; import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.factory.msg.MsgMoneyDetailFactory; @@ -31,11 +30,14 @@ private MsgMoneyDetailService msgMoneyDetailService; @Resource private PushService pushService; + + @Resource + private MsgExtraService msgExtraService; @Override public void extractApplay(Extract extract) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractApplyMsg(extract, extract.getUserInfo().getId(), - null); + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("浜哄伐瀹℃牳涓�", extract.getUserInfo().getId(), + extract, null, null); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -43,21 +45,11 @@ } } - @Async - @Override - public void extractAuto(ExtractWeiXinRecord extractRecord, String stateDesc, String desc, String beiZhu) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractAutoMsg(extractRecord, stateDesc, desc, beiZhu); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - } @Override - public void extractFail(Extract extract, String stateDesc) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractFailMsg(extract, extract.getUserInfo().getId(), - stateDesc); + public void extractFail(Extract extract, String reason) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇澶辫触", extract.getUserInfo().getId(), + extract, reason, null); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -76,9 +68,9 @@ } @Override - public void extractSuccess(Extract extract) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractSuccessMsg(extract, extract.getUserInfo().getId(), - null); + public void extractSuccess(Extract extract, String alipayNo) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇鎴愬姛", extract.getUserInfo().getId(), + extract, null, alipayNo); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -96,9 +88,9 @@ } @Override - public void alipayAccountValid(AlipayAccountValidNormalHistory history) { + public void alipayAccountValid(AlipayAccountValidNormalHistory history, String limitDay, boolean change) { MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidMsg(history, history.getUid(), - Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), null); + Constant.alipayConfig.getAccountName(), new BigDecimal("0.1"), limitDay, change); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -115,11 +107,46 @@ } } + + @Override + public void alipayAccountValidFail(AlipayAccountValidNormalHistory history, int limitDay, boolean change) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidFail(history, history.getUid(), + Constant.systemCommonConfig.getProjectChineseName(), new BigDecimal("0.1"), limitDay, change); + try { + msgMoneyDetailService.addMsgMoneyDetail(detail); + } catch (MsgMoneyDetailException e) { + e.printStackTrace(); + } + } + + @Override public void fanliOrderReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money, - BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createFailiMsg(money, balance, orderId, orderType, goodsCount, - uid, null); + BigDecimal balance, Date downTime) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount, + uid, downTime, false); + try { + msgMoneyDetailService.addMsgMoneyDetail(detail); + } catch (MsgMoneyDetailException e) { + e.printStackTrace(); + } + + PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money); + try { + pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); + } catch (NumberFormatException e) { + e.printStackTrace(); + } catch (PushException e) { + e.printStackTrace(); + } + } + + + @Override + public void rewardCounponReceived(Long uid, String orderId, int orderType, int goodsCount, BigDecimal money, + BigDecimal balance, Date downTime) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, goodsCount, + uid, downTime, true); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -137,9 +164,10 @@ } @Override - public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createFailiWeiQuanMsg(uid, orderId, orderType, money, balance, - null); + public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney, + int goodsCount, Date downTime) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderWeiQuanMsg(uid, orderId, orderType, money, fanliMoney, + goodsCount, downTime, Constant.TYPE_REBATE); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -159,14 +187,14 @@ @Override public void shareOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, - BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createShareMsg(money, balance, orderType, orderCount, goodsCount, - uid, null); + BigDecimal balance, String orderId, Date downTime) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { e.printStackTrace(); } + PushContentDTO dto = PushMsgFactory.createMoneyShareRecieved(orderType, money); try { pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); @@ -178,9 +206,10 @@ } @Override - public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createShareWeiQuanMsg(uid, orderId, orderType, money, balance, - null); + public void shareOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney, + int goodsCount, Date downTime) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderWeiQuanMsg(uid, orderId, orderType, money, fanliMoney, + goodsCount, downTime, Constant.TYPE_SHAER); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -195,97 +224,28 @@ } catch (PushException e) { e.printStackTrace(); } - } - - @Override - public void inviteOrderReceived(Long uid, int orderType, int orderCount, int goodsCount, BigDecimal money, - BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteMsg(money, balance, orderType, orderCount, goodsCount, - uid, null); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - - PushContentDTO dto = PushMsgFactory.createMoneyInviteRecieved(orderType, money); - try { - pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } - } - - @Override - public void inviteOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteWeiQuanMsg(uid, orderId, orderType, money, balance, - null); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - PushContentDTO dto = PushMsgFactory.createMoneyOrderShareOrInviteWeiquan(orderType, orderId, false, money); - try { - pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } - } - - @Override - public void orderReward(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createOrderRewardMsg(uid, orderId, orderType, money, balance, - null); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - - PushContentDTO dto = PushMsgFactory.createMoneySystemReward("浣跨敤杩斿埄濂栧姳鍒�", money); - try { - pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } - } + @Override public void systemEqualize(Long uid, String reason, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createSystemEqualizeMsg(uid, reason, money, balance, null); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - - PushContentDTO dto = PushMsgFactory.createMoneySystemCompensate(reason, money); - try { - pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } +// MsgMoneyDetail detail = MsgMoneyDetailFactory.createSystemEqualizeMsg(uid, reason, money, balance, null); +// try { +// msgMoneyDetailService.addMsgMoneyDetail(detail); +// } catch (MsgMoneyDetailException e) { +// e.printStackTrace(); +// } +// +// PushContentDTO dto = PushMsgFactory.createMoneySystemCompensate(reason, money); +// try { +// pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); +// } catch (NumberFormatException e) { +// e.printStackTrace(); +// } catch (PushException e) { +// e.printStackTrace(); +// } } - @Override - public void elmeFanli(Long uid, String orderId, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createElmeFanliMsg(uid, orderId, money, balance, null); - try { - msgMoneyDetailService.addMsgMoneyDetail(detail); - } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - } @Override public void redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) { @@ -296,9 +256,9 @@ e.printStackTrace(); } } - + @Override - public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type,BigDecimal money, String stateDesc, + public void teamRedPackRewardMsg(Long uid, MsgTypeMoneyTypeEnum type, BigDecimal money, String stateDesc, String content) { MsgMoneyDetail detail = new MsgMoneyDetail(); detail.setRead(false); @@ -316,9 +276,10 @@ } } + @Override - public void inviteOrderSubSidy(Long uid, Date date, String from, BigDecimal money, BigDecimal balance) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createInviteOrderSubSidyMsg(uid, date, from, money, balance, null); + public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -326,4 +287,5 @@ } } + } -- Gitblit v1.8.0