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

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

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

@@ -205,12 +205,13 @@
            public void run() {

               while (true) {

                  try {



                     // 取16个订单

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

                     Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                     if (orderIds != null) {

                        for (String orderId : orderIds) {

                           if (NumberUtil.isNumeric(orderId.trim())) {

                              Map<String, List<TaoBaoOrder>> map = new HashMap<>();

                              List<TaoBaoOrder> orderList = taoBaoOrderService

                                    .getTaoBaoOrderByOrderId(orderId);

                              map.put(orderId, orderList);

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

               } catch (Exception e) {

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



               }

            }

         }

@@ -634,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());



               }

            }

         }