券推送调用

yujian

2019-03-07 e6cb7c27384f22b39ccee584028e23b56c30e9ee

 fanli/src/main/java/com/yeshi/fanli/job/UpdateOrderJob.java

@@ -10,6 +10,8 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import com.yeshi.fanli.entity.bus.user.LostOrder;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.taobao.PidUser;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

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

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

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

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

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

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

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

@@ -77,6 +80,9 @@


   @Resource

   private LostOrderService lostOrderService;



   @Resource

   private OrderService orderService;



   private void updateOrder(long startTime, long endTime) {

      List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);

@@ -168,8 +174,20 @@
            // 移除会员运营ID与渠道专属订单

            if (orderList.get(i).getAdPositionName().contains("会员运营")

                  || orderList.get(i).getAdPositionName().contains("渠道专属")) {

               orderList.remove(i);

               i--;

               if (orderList.get(i).getAdPositionName().contains("会员运营")) {// 处理订单申诉

                  Order order = orderService.findOrderByOrderIdAndType(orderList.get(i).getOrderId(),

                        Order.ORDER_TYPE_TAOBAO);

                  if (order != null && order.getBeizhu().contains("补单")) {// 不排除补单的情况



                  } else {

                     orderList.remove(i);

                     i--;

                     break;

                  }

               } else {

                  orderList.remove(i);

                  i--;

               }

            }

         }