Merge branch 'dev1'

Administrator

2018-11-14 7ba5c2575d8c13ce53d5d562fe7f6b649e7778b5

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java

@@ -35,7 +35,7 @@
      Iterator<String> its = map.keySet().iterator();

      while (its.hasNext()) {

         String orderId = its.next();

         String key = "doorder-" + orderId;

         String key = "addorder-" + orderId;

         // redis做频率限制

         try {

            if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {