Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java

@@ -6,7 +6,7 @@


import org.springframework.stereotype.Service;



import com.yeshi.fanli.controller.client.UserInfoController;

import com.yeshi.fanli.controller.client.v1.UserInfoController;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.entity.bus.user.AccountMessage;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

@@ -39,7 +39,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getNewerHongbaoTitle(),

               Constant.znxConfig.getNewerHongbaoMsg().replace("[金额]", money.toString()), null);

               Constant.znxConfig.getNewerHongbaoMsg().replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -51,7 +51,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getOrderFanliRecieveTitle(), Constant.znxConfig

               .getOrderFanliRecieveMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null);

               .getOrderFanliRecieveMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -63,20 +63,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),

               Constant.znxConfig.getShareMoneyRecieveMsg().replace("[金额]", money.toString()), null);

      } catch (PushException e) {

         e.printStackTrace();

      }

   }



   @Override

   public void orderFanliStatisticed(Long uid, String orderId, int goodsCount, int orderState, BigDecimal payMoney,

         BigDecimal money) {

      if (Constant.IS_TEST)

         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),

               Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[订单号]", orderId), null);

               Constant.znxConfig.getShareMoneyRecieveMsg().replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -89,7 +76,7 @@
      orderId = orderId.substring(0, orderId.length() - 6) + "******";

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getTichengOrderStatisticedTitle(), Constant.znxConfig

               .getTichengOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null);

               .getTichengOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -131,7 +118,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getExtractApplayTitle(),

               Constant.znxConfig.getExtractApplayMsg(), null);

               Constant.znxConfig.getExtractApplayMsg(), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -143,7 +130,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getExtractTransferFailTitle(),

               Constant.znxConfig.getExtractTransferFailMsg().replace("[时间]", time), null);

               Constant.znxConfig.getExtractTransferFailMsg().replace("[时间]", time), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -170,7 +157,7 @@


      try {

         pushService.pushZNX(uid, Constant.znxConfig.getExtractWrongTitle(),

               Constant.znxConfig.getExtractWrongMsg().replace("[时间]", time), null);

               Constant.znxConfig.getExtractWrongMsg().replace("[时间]", time), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -198,7 +185,7 @@


      try {

         pushService.pushZNX(uid, Constant.znxConfig.getExtractSuccessTitle(),

               Constant.znxConfig.getExtractSuccessMsg().replace("[时间]", time), null);

               Constant.znxConfig.getExtractSuccessMsg().replace("[时间]", time), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -228,7 +215,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getInviteMoneyRecieveTitle(),

               Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[金额]", money.toString()), null);

               Constant.znxConfig.getInviteMoneyRecieveMsg().replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -241,7 +228,7 @@
         return;

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getShareMoneyRecieveTitle(),

               Constant.znxConfig.getShareMoneyRecieveMsg().replace("[金额]", money.toString()), null);

               Constant.znxConfig.getShareMoneyRecieveMsg().replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -256,7 +243,7 @@
      orderId = orderId.substring(0, orderId.length() - 6) + "******";

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getShareOrderStatisticedTitle(), Constant.znxConfig

               .getShareOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null);

               .getShareOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }

@@ -271,7 +258,7 @@
      orderId = orderId.substring(0, orderId.length() - 6) + "******";

      try {

         pushService.pushZNX(uid, Constant.znxConfig.getInviteOrderStatisticedTitle(), Constant.znxConfig

               .getInviteOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null);

               .getInviteOrderStatisticedMsg().replace("[订单号]", orderId).replace("[金额]", money.toString()), null, null);

      } catch (PushException e) {

         e.printStackTrace();

      }