Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -205,7 +205,7 @@
            public void run() {

               while (true) {

                  try {

							


                     // 取16个订单

                     List<String> orderIds = CMQManager.getInstance().consumeTaoBaoOrderMsg(16);

                     if (orderIds != null) {

@@ -570,7 +570,6 @@
                  }

               } catch (Exception e) {

                  LogHelper.error("还款出错:" + e.getMessage());



               }

            }

         }

@@ -635,17 +634,12 @@
                           }

                           PDDOrderCMQManager.getInstance().deletePDDOrder(key);

                        } catch (Exception e) {

                           try {

                              LogHelper.errorDetailInfo(e);

                           } catch (Exception e1) {

                              e1.printStackTrace();

                           }

                           LogHelper.errorDetailInfo(e);

                        }

                     }

                  }

               } catch (Exception e) {

                  LogHelper.error("拼多多订单:" + e.getMessage());



               }

            }

         }