Merge branch 'div_10'

yujian

2019-05-14 efa2645b74ebfadc43ebe448370adb22aecc1ad7

 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;



@@ -10,7 +11,6 @@
import com.yeshi.fanli.exception.msg.MsgOrderDetailException;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.msg.MsgOrderDetailFactory;



@Service

@@ -98,11 +98,18 @@


   }



   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】分享", sourceUserName));

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

      try {

         msgOrderDetailService.addMsgOrderDetail(detail);

      } catch (MsgOrderDetailException e) {

@@ -124,4 +131,28 @@


   }



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

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

   }



}