Merge remote-tracking branch 'origin/master'

yujian

2019-06-20 bf5d1b405c759de3faa42af37b1f10f42823b105

 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java

@@ -38,6 +38,7 @@
      }



      try {

         if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)

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

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

      } catch (PushException e) {