Merge remote-tracking branch 'origin/master'

admin

2019-01-19 0e5e21d2f3693dc993b3f49d88a275f7b226eba5

 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 {