Merge remote-tracking branch 'origin/master'

admin

2019-04-12 2406574c36a8c4e8e8ffe7c56a34e25dde107a84

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

@@ -35,12 +35,12 @@
         int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

//暂时不推送

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }



   }



@@ -62,12 +62,12 @@
         int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

//暂时不推送

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }



   }



@@ -88,12 +88,12 @@
         int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 0, orderState, payMoney, money,

            null);

//暂时不推送

//      try {

//         msgOrderDetailService.updateMsgOrderDetail(detail);

//      } catch (MsgOrderDetailException e) {

//         e.printStackTrace();

//      }

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }



   }