Merge remote-tracking branch 'origin/master'

yujian

2019-05-30 ebce479a2d0634c90e5f80045e204248336b410d

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

@@ -104,15 +104,15 @@
      Set<String> specialIdSets = new HashSet<>();

      Set<Long> uidSets = new HashSet<>();



      for (TaoBaoPunishOrder order : orderList) {

         if (!StringUtil.isNullOrEmpty(order.getRelationId()))

            relationIdSets.add(order.getRelationId());



         if (!StringUtil.isNullOrEmpty(order.getSpecialId()))

            specialIdSets.add(order.getSpecialId());



         doPunishOrder(order, uidSets);

      }

//      for (TaoBaoPunishOrder order : orderList) {

//         if (!StringUtil.isNullOrEmpty(order.getRelationId()))

//            relationIdSets.add(order.getRelationId());

//

//         if (!StringUtil.isNullOrEmpty(order.getSpecialId()))

//            specialIdSets.add(order.getSpecialId());

//

//         doPunishOrder(order, uidSets);

//      }



      for (Iterator<String> its = relationIdSets.iterator(); its.hasNext();) {

         String relationId = its.next();