From aa43ebe703d3b28520a8b1e4b852b8beb957c5ca Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 20 四月 2020 14:21:25 +0800 Subject: [PATCH] 京东订单爬单规则修改 --- fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java | 125 +++++++++++++++-------------------------- 1 files changed, 47 insertions(+), 78 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 4f60cd6..cb0d725 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 @@ -30,14 +30,14 @@ private MsgMoneyDetailService msgMoneyDetailService; @Resource private PushService pushService; - + @Resource private MsgExtraService msgExtraService; @Override public void extractApplay(Extract extract) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("浜哄伐瀹℃牳涓�", extract.getUserInfo().getId(), - extract, null, null); + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("浜哄伐瀹℃牳涓�", extract.getUserInfo().getId(), extract, + null, null); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -45,32 +45,21 @@ } } - @Override public void extractFail(Extract extract, String reason) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇澶辫触", extract.getUserInfo().getId(), - extract, reason, null); + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇澶辫触", extract.getUserInfo().getId(), extract, + reason, null); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { - e.printStackTrace(); - } - - PushContentDTO dto = PushMsgFactory.createmoneyExtractFail(new Date(extract.getExtractTime()), - extract.getMoney(), extract.getAccount()); - try { - pushService.pushZNX(extract.getUserInfo().getId(), dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { e.printStackTrace(); } } @Override public void extractSuccess(Extract extract, String alipayNo) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇鎴愬姛", extract.getUserInfo().getId(), - extract, null, alipayNo); + MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("鎻愮幇鎴愬姛", extract.getUserInfo().getId(), extract, + null, alipayNo); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -96,18 +85,8 @@ } catch (MsgMoneyDetailException e) { e.printStackTrace(); } - - PushContentDTO dto = PushMsgFactory.createAlipayAccountValid(history.getAccount(), new BigDecimal("0.1")); - try { - pushService.pushZNX(history.getUid(), dto.getTitle(), dto.getContent(), null, null); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (PushException e) { - e.printStackTrace(); - } } - @Override public void alipayAccountValidFail(AlipayAccountValidNormalHistory history, int limitDay, boolean change) { MsgMoneyDetail detail = MsgMoneyDetailFactory.createAlipayAccountValidFail(history, history.getUid(), @@ -118,13 +97,12 @@ e.printStackTrace(); } } - - + @Override public void fanliOrderReceived(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, false); + MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, + goodsCount, uid, downTime, false); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -140,13 +118,12 @@ 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); + MsgMoneyDetail detail = MsgMoneyDetailFactory.fanLiOrderReceivedMsg(money, balance, orderId, orderType, + goodsCount, uid, downTime, true); try { msgMoneyDetailService.addMsgMoneyDetail(detail); } catch (MsgMoneyDetailException e) { @@ -164,7 +141,7 @@ } @Override - public void fanliOrderWeiQuan(Long uid, String orderId, int orderType, BigDecimal money, BigDecimal fanliMoney, + 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); @@ -173,27 +150,18 @@ } catch (MsgMoneyDetailException e) { e.printStackTrace(); } - - // TODO 闇�瑕佷紶鍏ユ槸鍚﹂儴鍒嗙淮鏉� - PushContentDTO dto = PushMsgFactory.createMoneyOrderFanLiWeiquan(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 shareOrderReceived(Long uid, int orderType, BigDecimal money,BigDecimal balance, Date receivedDate) { - MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid, receivedDate); + public void shareOrderReceived(Long uid, int orderType, BigDecimal money, BigDecimal balance, Date receivedDate) { + MsgMoneyDetail detail = MsgMoneyDetailFactory.shareOrderReceivedMsg(money, balance, orderType, uid, + receivedDate); 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); @@ -214,38 +182,31 @@ } 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 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 redPackMsg(Long uid, MsgTypeMoneyTypeEnum type, String content, String beiZhu) { MsgMoneyDetail detail = MsgMoneyDetailFactory.createRedPackMsg(uid, type, content, beiZhu); @@ -275,7 +236,6 @@ } } - @Override public void teamReceive(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) { MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鏀剁泭"); @@ -286,7 +246,6 @@ } } - @Override public void teamDividend(Long uid, BigDecimal money, BigDecimal balance, Date receivedDate) { MsgMoneyDetail detail = MsgMoneyDetailFactory.createTeamReceivedMsg(uid, money, balance, receivedDate, "鍥㈤槦鍒嗙孩"); @@ -295,6 +254,16 @@ } catch (MsgMoneyDetailException e) { e.printStackTrace(); } + + // 鎺ㄩ�佹秷鎭� + PushContentDTO dto = PushMsgFactory.createMoneyTeamDividents(money); + try { + pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null); + } catch (NumberFormatException e) { + e.printStackTrace(); + } catch (PushException e) { + e.printStackTrace(); + } } } -- Gitblit v1.8.0