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;

@@ -64,19 +64,6 @@
      try {

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

               Constant.znxConfig.getShareMoneyRecieveMsg().replace("[金额]", money.toString()), null, 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, null);

      } catch (PushException e) {

         e.printStackTrace();

      }