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

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

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

@@ -46,7 +46,7 @@


   @Resource

   private UserInfoService userInfoService;

	


   @Resource

   private UserAccountService userAccountService;



@@ -107,15 +107,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();

@@ -139,4 +139,9 @@


   }



   @Override

   public int countByTradeParentId(String orderId) {

      return (int) (taoBaoPunishOrderMapper.countByParentTradeId(orderId));

   }



}