Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -183,8 +183,6 @@
               BigDecimal money = notify.getMoney();

               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

                  userNotificationService.orderFanliStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,

                        null, money);

                  userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, commonOrder.getPayment(),

                        money, goodsCount, state);

                  break;

@@ -1023,4 +1021,9 @@
      else

         return money;

   }

	
   @Override

   public List<HongBaoV2> listChildrenById(Long id){

      return hongBaoV2Mapper.listChildrenById(id);

   }

}