Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-22 1011d9d0aaab0e978caf4513b64f0a369bcd9a96

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

@@ -26,10 +26,10 @@
   private PushService pushService;



   @Override

   public void orderFanLiStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,

         int orderState) {

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

            money, null);

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

         int goodsCount, int orderState) {

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

            payMoney, money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

@@ -38,18 +38,19 @@
      }



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

      }

   }



   @Override

   public void orderFanLiStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,

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

         int orderState) {

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

            null);

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

            money, null);

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

@@ -60,10 +61,10 @@
   }



   @Override

   public void orderShareStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,

         int orderState) {

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

            money, null);

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

         int goodsCount, int orderState) {

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

            payMoney, money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

@@ -74,24 +75,24 @@
   }



   @Override

   public void orderShareStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,

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

         int orderState) {

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

            null);

      MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, orderType, 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

   public void orderInviteStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money, int goodsCount,

         int orderState) {

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

            money, null);

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

         int goodsCount, int orderState) {

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

            payMoney, money, null);

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

@@ -101,16 +102,16 @@
   }



   @Override

   public void orderInviteStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,

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

         int orderState) {

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

            null);

      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 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();

      // }



   }



@@ -122,10 +123,10 @@
   }



   @Override

   public void orderShareFirstLevelStatistic(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,

         int goodsCount, int orderState, String sourceUserName) {

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

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

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

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

@@ -135,16 +136,16 @@
   }



   @Override

   public void orderShareFirstLevelStateChanged(Long uid, String orderId, BigDecimal payMoney, BigDecimal money,

         int orderState) {

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

            null);

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

         BigDecimal money, int orderState) {

      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, orderType, 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