Merge remote-tracking branch 'origin/master'

admin

2019-02-14 c573834c796cc77057455ef0b3d8d0412f9792b9

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

@@ -287,7 +287,16 @@
         Iterator<String> its = orders.keySet().iterator();

         while (its.hasNext()) {

            String orderId = its.next();

            processShareGoodsOrderNew(orderId, orders.get(orderId));

            try {

               processShareGoodsOrderNew(orderId, orders.get(orderId));

            } catch (Exception e) {

               try {

                  LogHelper.errorDetailInfo(e, null, "订单号:" + orderId);

               } catch (Exception e1) {

                  e1.printStackTrace();

               }

            }



         }

      }

   }