Merge branch 'dev-hongbao'

admin

2019-01-03 5981b2cae7c20ec9021c8ccbe1a926f35f640210

 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -91,7 +91,7 @@
         doPushIOS();// 处理发送IOS消息

      } else if (!Constant.IS_TEST) {

         initScheduler();// 启动定时任务

//         doUpdateGoodsJob();

         // doUpdateGoodsJob();

      }

   }



@@ -166,7 +166,11 @@
                        orderProcessService.processOrder(map);

                     }

                  } catch (Exception e) {

                     try {

                        LogHelper.errorDetailInfo(e);

                     } catch (Exception e1) {



                     }

                  }

               }

            }

@@ -376,7 +380,7 @@
                        }

                     }

                  } catch (Exception e) {

                     LogHelper.error("更新商品出错:"+e.getMessage());

                     LogHelper.error("更新商品出错:" + e.getMessage());



                  }

               }