大淘客商品过滤修改

admin

2020-03-31 dcfd801ea435c1c87ed47f2ee24cdabaaf230d6f

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -73,6 +73,7 @@
import com.yeshi.fanli.service.inter.order.LostOrderService;

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

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

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

import com.yeshi.fanli.service.inter.order.jd.JDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

@@ -166,6 +167,9 @@
   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;



   @Resource

   private OrderTeamRewardService orderTeamRewardService;



   /**

    * 是否是分享订单

    * 

@@ -216,9 +220,14 @@
            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {

               // 处理饿了么订单

               elmeOrderMap.put(orderId, list);

            }



            else {

               // TODO 处理饿了么订单

               // if(list.get(0).getCreateTime()){

               // //下单时间大于一个定值就进入淘宝订单

               // //获取relationId

               //

               //

               // }

            } else {

               if (!StringUtil.isNullOrEmpty(list.get(0).getSpecialId())

                     || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)) {// 设置渠道ID当做会员运营ID的位置ID

                  fanliOrderMap.put(orderId, list);

@@ -1339,4 +1348,28 @@
      return false;

   }



   @Override

   public void fanliOrderTeamReward() {

      Date time = new Date();

      long count = orderTeamRewardService.countCanSettleUid(time);

      int pageSize = 500;

      int page = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

      List<Long> uidList = new ArrayList<>();

      for (int i = 0; i < page; i++) {

         List<Long> list = orderTeamRewardService.listCanSettleUid(time, i + 1, pageSize);

         if (list != null && list.size() > 0)

            uidList.addAll(list);

      }

      // 添加到队列

      if (uidList != null)

         for (Long uid : uidList)

            if (!Constant.IS_TEST)

               CMQManager.getInstance().addFanLiOrderTeamRewardMsg(uid);

   }



   @Override

   public void fanliOrderTeamReward(Long uid) throws OrderMoneySettleException {

      orderMoneySettleService.orderTeamRewardSettle(uid);

   }



}