冲突解决

yujian

2019-01-09 075f6eceec6908178ba53b40b7794e2f90f74c92

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

@@ -253,7 +253,7 @@
         return;

      orderId = orderId.substring(0, orderId.length() - 6) + "******";

      try {

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

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

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

      } catch (PushException e) {

         e.printStackTrace();