Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -25,7 +25,9 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createFanLiOrder(uid, orderId, goodsCount, orderState, payMoney,

            money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);



         msgOrderDetailService.addMsgOrderDetail(detail,

               (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -51,7 +53,8 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, goodsCount, orderState, payMoney,

            money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

         msgOrderDetailService.addMsgOrderDetail(detail,

               (payMoney == null || payMoney.compareTo(new BigDecimal(0)) <= 0) ? false : true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -78,7 +81,8 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,

            money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

         msgOrderDetailService.addMsgOrderDetail(detail,

               (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -111,7 +115,8 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, goodsCount, orderState, payMoney,

            money, String.format("由一级队员【%s】分享", getShortName(sourceUserName)));

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

         msgOrderDetailService.addMsgOrderDetail(detail,

               (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -128,28 +133,25 @@
      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }



   }



   @Override

   public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType,

         Date happendDate) {

   public void orderFoundSuccess(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, true, payMoney, orderType,

            happendDate, "如有疑问请联系人工客服");

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

         msgOrderDetailService.addMsgOrderDetail(detail, true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



   @Override

   public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType,

         Date happendDate) {

   public void orderFoundFail(Long uid, String orderId, BigDecimal payMoney, int orderType, Date happendDate) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createFoundOrder(uid, orderId, false, payMoney, orderType,

            happendDate, "如有疑问请联系人工客服");

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

         msgOrderDetailService.addMsgOrderDetail(detail, true);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }