Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.msg;



import java.math.BigDecimal;

import java.util.Date;



import javax.annotation.Resource;



@@ -24,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();

      }

@@ -35,12 +38,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();

      }



   }



@@ -50,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();

      }

@@ -62,12 +66,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();

      }



   }



@@ -77,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();

      }

@@ -88,13 +93,68 @@
         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();

      }



   }



   private String getShortName(String name) {

      if (name != null && name.length() > 2) {

         return name.charAt(0) + "**" + name.charAt(name.length() - 1);

      }

      return name;

   }



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

      try {

         msgOrderDetailService.addMsgOrderDetail(detail,

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



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

      // 暂时不推送

      try {

         msgOrderDetailService.updateMsgOrderDetail(detail, false);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



   @Override

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



   @Override

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



}