Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 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();

      }

@@ -79,11 +80,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail, false);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }



   }



@@ -106,11 +107,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail, false);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }



   }



@@ -140,11 +141,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail, false);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }

   }



   @Override