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

@@ -21,10 +21,10 @@
import com.yeshi.fanli.service.inter.order.CommonOrderService;

import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoPunishOrderService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



@Service

public class TaoBaoPunishOrderServiceImpl implements TaoBaoPunishOrderService {

@@ -46,6 +46,9 @@


   @Resource

   private UserInfoService userInfoService;



   @Resource

   private UserAccountService userAccountService;



   @Transactional

   @Override

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

@@ -131,9 +134,14 @@


      for (Iterator<Long> its = uidSets.iterator(); its.hasNext();) {

         Long uid = its.next();

         userInfoService.forbiddenUser(uid, "产生违规订单自动封禁");

         userAccountService.forbiddenUserAll(uid, "产生违规订单自动封禁");

      }



   }



   @Override

   public int countByTradeParentId(String orderId) {

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

   }



}