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

yujian

2020-04-14 c04a59775ee986f33fe19e21ae02cff9f6b002a7

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

@@ -30,9 +30,6 @@
   @Resource

   private PushService pushService;

   

   @Resource

   private MsgExtraService msgExtraService;

	


   @Override

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

@@ -115,8 +112,6 @@
         MsgOrderDetail detail = MsgOrderDetailFactory.createOrderStatistics(uid, orderId, source, type, goodsCount, payMoney, money, downTime, beiZhu);

         // 消息

         msgOrderDetailService.addMsgOrderDetail(detail, needNotify);

         // 消息内容

         msgExtraService.addMsgExtra(detail.getId(),detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -131,8 +126,6 @@
         MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundSuccess(uid, orderId, orderSource, type, goodsCount, payMoney, money, submitTime, "");

         // 消息

         msgOrderDetailService.addMsgOrderDetail(detail, true);

         // 消息内容

         msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }

@@ -145,8 +138,6 @@
         MsgOrderDetail detail = MsgOrderDetailFactory.createOrderFoundFail(uid, orderId, "");

         // 消息

         msgOrderDetailService.addMsgOrderDetail(detail, true);

         // 消息内容

         msgExtraService.addMsgExtra(detail.getId(), detail.getExtraInfo(), MsgExtra.MSG_TYPE_ORDER);

      } catch (MsgOrderDetailException e) {

         e.printStackTrace();

      }