订单接口筛选统计数据调整

yujian

2019-01-04 38fffe4319f408b5dc1da23d30512e90b0f4feac

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

@@ -13,6 +13,7 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;

@@ -173,11 +174,11 @@
                  list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());

            PidUser pidUser = pidUserMapper.selectByPid(pid);

            if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 商品分享订单

//               List<PidOrder> pidOrderList = new ArrayList<>();

//               for (TaoBaoOrder order : list) {

//                  pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));

//               }

//               sharePidOrderMap.put(orderId, pidOrderList);

               // List<PidOrder> pidOrderList = new ArrayList<>();

               // for (TaoBaoOrder order : list) {

               // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));

               // }

               // sharePidOrderMap.put(orderId, pidOrderList);

               shareOrderMap.put(orderId, list);

            } else {// 普通返利订单

               fanliOrderMap.put(orderId, list);

@@ -226,16 +227,15 @@
         return false;

   }



   @Transactional

   @Override

   public void processShopingFanliOrder(Map<String, List<TaoBaoOrder>> orders) {

      // 查询在Order中是否存在该订单号

      Iterator<String> its = orders.keySet().iterator();

      String tempOrderId="";

      String tempOrderId = "";

      while (its.hasNext()) {

         try {

            String orderId = its.next();

            tempOrderId=orderId;

            tempOrderId = orderId;

            // 处理红包与子红包

            // if (isRedisLockOrder(orderId))

            // continue;

@@ -841,7 +841,7 @@
   @Resource

   private HongBaoV2Service hongBaoV2Service;



   @Transactional

   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

   @Override

   public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)

         throws HongBaoException, OrderItemException {