Merge branch 'master-new' into div

yujian

2019-06-24 4c68642aad8889ff599af52d33453c483f13092a

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

@@ -38,8 +38,9 @@
      }



      try {

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

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

         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) {

         e.printStackTrace();

      }