Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/UserMoneyMsgNotificationServiceImpl.java

@@ -37,7 +37,7 @@
   @Override

   public void extractApplay(Extract extract) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("人工审核中", extract.getUserInfo().getId(), extract,

            null, null);

            null, null, "审核将会在24小时内完成");

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {

@@ -48,7 +48,7 @@
   @Override

   public void extractFail(Extract extract, String reason) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("提现失败", extract.getUserInfo().getId(), extract,

            reason, null);

            reason, null, "如有疑问请联系人工客服");

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {

@@ -59,12 +59,13 @@
   @Override

   public void extractSuccess(Extract extract, String alipayNo) {

      MsgMoneyDetail detail = MsgMoneyDetailFactory.createExtractMsg("提现成功", extract.getUserInfo().getId(), extract,

            null, alipayNo);

            null, alipayNo, "如有疑问请联系人工客服");

      try {

         msgMoneyDetailService.addMsgMoneyDetail(detail);

      } catch (MsgMoneyDetailException e) {

         e.printStackTrace();

      }

		
      PushContentDTO dto = PushMsgFactory.createMoneyExtractSuccess(new Date(extract.getExtractTime()),

            extract.getMoney(), extract.getAccount());

      try {