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

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;

@@ -31,11 +32,13 @@
import com.yeshi.fanli.entity.bus.user.AccountDetails;

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

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

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

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

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

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

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

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.CommonOrder;

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

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

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

@@ -47,10 +50,13 @@
import com.yeshi.fanli.exception.OrderItemException;

import com.yeshi.fanli.exception.TaoBaoWeiQuanException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.CommonOrderException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoService;

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

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

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

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

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

@@ -158,7 +164,8 @@
      // 分离出返利订单与分享赚订单

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

      Map<String, List<TaoBaoOrder>> fanliOrderMap = new HashMap<>();

      Map<String, List<PidOrder>> shareOrderMap = new HashMap<>();

      Map<String, List<PidOrder>> sharePidOrderMap = new HashMap<>();

      Map<String, List<TaoBaoOrder>> shareOrderMap = new HashMap<>();

      while (its.hasNext()) {

         String orderId = its.next();

         if (orders.get(orderId) != null && orders.get(orderId).size() > 0) {

@@ -167,11 +174,12 @@
                  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));

               }

               shareOrderMap.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);

            }

@@ -219,19 +227,20 @@
         return false;

   }



   @Transactional

   @Override

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

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

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

      String tempOrderId = "";

      while (its.hasNext()) {

         try {

            String orderId = its.next();

            tempOrderId = orderId;

            // 处理红包与子红包

            // if (isRedisLockOrder(orderId))

            // continue;

            // redisLockOrder(orderId);

            processShopingFanliOrder(orderId, orders.get(orderId));

            processShopingFanliOrderNew(orderId, orders.get(orderId));

            // redisUnlockOrder(orderId);

            // 出错了就不处理该订单了，需要定期检查



@@ -243,15 +252,27 @@
         } catch (OrderItemException e2) {

            e2.printStackTrace();

         } catch (Exception e) {



            e.printStackTrace();

            try {

               LogHelper.errorDetailInfo(e, null, tempOrderId);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }

      }

   }



   @Transactional

   @Override

   public void processShareGoodsOrder(Map<String, List<PidOrder>> orders) {

      pidOrderService.addPidOrderFromTaoBao(orders);

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

      // pidOrderService.addPidOrderFromTaoBao(orders);

      if (orders != null) {

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

         while (its.hasNext()) {

            String orderId = its.next();

            processShareGoodsOrderNew(orderId, orders.get(orderId));

         }

      }

   }



   /**

@@ -519,7 +540,7 @@
            // 插入新版资金明细

            try {

               UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),

                     hb.getOrderId(), 1,hb.getId(), hb.getMoney());

                     hb.getOrderId(), 1, hb.getId(), hb.getMoney());

               userMoneyDetail.setId(accountDetails.getId());

               userMoneyDetailMapper.insert(userMoneyDetail);

            } catch (UserMoneyDetailException e1) {

@@ -663,9 +684,7 @@
            }

         }

      }

		
		
		


      /**

       * 处理一级二级分享赚(属于邀请赚类型)

       */

@@ -699,9 +718,7 @@
               drawBackOrders.add(hb.getOrderId());

         }

      }

		
		
		


      // 邀请赚到账

      if (invitemoney.compareTo(new BigDecimal(0)) > 0) {

         userInfoMapper.addHongBaoByUid(uid, invitemoney);

@@ -776,8 +793,6 @@
         }

      }



		


      /**

       * 分享赚到账

       */

@@ -820,4 +835,118 @@


   }



   @Resource

   private CommonOrderService commonOrderService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;



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

   @Override

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

         throws HongBaoException, OrderItemException {

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



      if (orderList != null && orderList.size() > 0) {

         String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),

               orderList.get(0).getSourceMediaId(), orderList.get(0).getAdPositionId());



         Order oldOrder = orderMapper.selectOrderByOrderId(orderId);

         // 原来不存在订单

         Long uid = null;

         if (oldOrder == null) {

            PidUser pidUser = pidUserMapper.selectByPid(pid);

            if (pidUser != null) {

               uid = pidUser.getUid();



               // 插入到Order中

               // 添加到订单中去

               Order order = new Order();

               order.setBeizhu("PID返利订单");

               order.setCreatetime(System.currentTimeMillis());

               order.setOrderId(orderId);

               order.setOrderType(1);

               order.setState(Order.STATE_YIZHIFU);

               order.setUserInfo(new UserInfo(uid));

               order.setVersion(2);

               // 加入到订单表

               orderMapper.insertSelective(order);

               oldOrder = order;

            }

         } else {

            uid = oldOrder.getUserInfo().getId();



         }

         // 尚未找到和PID对应的用户

         if (uid == null)

            return;



         // 计算订单总额度

         Order updateOrder = new Order();

         updateOrder.setId(oldOrder.getId());

         BigDecimal money = new BigDecimal(0);

         for (TaoBaoOrder o : orderList) {

            if (o.getOrderState().equalsIgnoreCase("订单结算"))

               money = money.add(o.getSettlement());

            else {

               money = money.add(o.getPayment());

            }

         }

         updateOrder.setMoney(money);

         String thirdState = null;

         for (TaoBaoOrder o : orderList)

            if (!o.getOrderState().equalsIgnoreCase("订单失效")) {

               thirdState = o.getOrderState();

               break;

            }

         updateOrder.setThirdState(thirdState);

         updateOrder.setThirdCreateTime(

               new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss")));

         orderMapper.updateByPrimaryKeySelective(updateOrder);



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_ZIGOU);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

               e1.printStackTrace();

            }

         }

      }

   }



   @Override

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

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

      if (orderList != null && orderList.size() > 0) {

         String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),

               orderList.get(0).getSourceMediaId(), orderList.get(0).getAdPositionId());

         // 原来不存在订单

         Long uid = null;

         PidUser pidUser = pidUserMapper.selectByPid(pid);

         if (pidUser != null)

            uid = pidUser.getUid();



         // 尚未找到和PID对应的用户

         if (uid == null)

            return;



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_SHARE_GOODS);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

               e1.printStackTrace();

            }

         }

      }



   }



}