Merge branch 'div1'

yujian

2019-01-05 4220ceb661146c58d1d6855f14dcdcc3d8c7bb24

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/PidOrderServiceImpl.java

@@ -298,6 +298,7 @@
                  

                  //统计分享订单的数据

                  try {

                     hongBao.setAuctionId(order.getAuctionId());

                     userShareGoodsGroupService.updateOrderRecord(hongBao);

                  } catch (UserShareGoodsRecordException e1) {

                     try {