Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -148,7 +148,7 @@
   public void orderShareFirstLevelStatistic(Long uid, String orderId, int orderType, BigDecimal payMoney,

         BigDecimal money, int goodsCount, int orderState, String sourceUserName) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, goodsCount, orderState,

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

            payMoney, money, String.format("由直接粉丝【%s】分享", getShortName(sourceUserName)));

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

@@ -164,7 +164,6 @@
      } catch (PushException e) {

         e.printStackTrace();

      }



   }



   @Override

@@ -202,4 +201,30 @@
      }

   }



   @Override

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

         int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createElmeOrder(uid, orderId, orderType, orderState, payMoney,

            money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



   @Override

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

         int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createElmeOrder(uid, orderId, orderType, orderState, payMoney,

            money, null);

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



}