Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -8,9 +8,12 @@
import org.springframework.stereotype.Service;



import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.exception.PushException;

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.service.inter.push.PushService;

import com.yeshi.fanli.util.Constant;

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



@Service

@@ -19,16 +22,26 @@
   @Resource

   private MsgOrderDetailService msgOrderDetailService;



   @Resource

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

      try {



         msgOrderDetailService.addMsgOrderDetail(detail,

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

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }



      try {

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

      }

   }

@@ -67,11 +80,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createShareOrder(uid, orderId, 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();

//      }



   }



@@ -94,11 +107,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 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();

//      }



   }



@@ -128,11 +141,11 @@
      MsgOrderDetail detail = MsgOrderDetailFactory.createInviteOrder(uid, orderId, 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