Merge remote-tracking branch 'origin/div' into div

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

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

@@ -26,6 +26,7 @@
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO;

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

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

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

@@ -49,10 +50,12 @@
import com.yeshi.fanli.log.LogHelper;

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

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

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

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

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

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

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

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

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

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

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

@@ -67,6 +70,7 @@
import com.yeshi.fanli.util.TaoBaoConstant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cmq.HongBaoRecieveCMQManager;

import com.yeshi.fanli.util.cmq.PlaceOrderCMQManager;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.jd.JDApiUtil;

import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;

@@ -125,6 +129,43 @@


   @Resource

   private HongBaoV2Service hongBaoV2Service;



   @Resource

   private JDOrderService jdOrderService;



   @Resource

   private PDDOrderService pddOrderService;



   /**

    * 是否是分享订单

    * 
    * @param order

    * @return

    */

   private boolean isShareOrder(TaoBaoOrder order) {

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

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

            order.getAdPositionId());

      if (!StringUtil.isNullOrEmpty(order.getSpecialId())

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

         return false;

      } else if (!StringUtil.isNullOrEmpty(order.getRelationId())) {

         return true;

      } else {

         // 通过红包查询

         CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

               order.getTradeId());



         if (commonOrder != null) {

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

            if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null

                  && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {

               return true;

            }

         }

         return false;

      }

   }



   @Override

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

@@ -947,11 +988,21 @@
         orderMapper.updateByPrimaryKeySelective(updateOrder);



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

         List<CommonOrder> commonOrderList = null;

         List<CommonOrderAddResultDTO> commonOrderList = null;

         try {

            commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

            hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);



            if (isCommonOrderAllAdd(commonOrderList)) {

               Order order = new Order();

               order.setOrderId(orderId);

               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

         } catch (CommonOrderException e) {

            try {

               LogHelper.errorDetailInfo(e, "addTaoBaoOrder或addHongBao出错", "订单号:" + orderId);

@@ -999,14 +1050,40 @@


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

         try {

            List<CommonOrder> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrders, HongBaoV2.TYPE_SHARE_GOODS);

            List<CommonOrderAddResultDTO> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(convertCommonOrder(commonOrders), HongBaoV2.TYPE_SHARE_GOODS);

            if (isCommonOrderAllAdd(commonOrders)) {

               Order order = new Order();

               order.setOrderId(orderId);

               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

         } catch (CommonOrderException e) {

            e.printStackTrace();

         } catch (HongBaoException e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 是否为分享订单

    * 
    * @param order

    * @return

    */

   private boolean isShareOrder(JDOrder order) {

      if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)

         return false;

      Long positionId = order.getOrderItemList().get(0).getPositionId();

      if (positionId == JDApiUtil.POSITION_SHARE) {// 分享订单

         return true;

      }

      return false;

   }



   @Override

@@ -1092,8 +1169,18 @@
      }



      try {

         List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

         List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);

         hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);

         if (isCommonOrderAllAdd(commonOrderList)) {

            Order order = new Order();

            order.setOrderId(jdOrder.getOrderId() + "");

            order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + jdOrder.getOrderId());

@@ -1116,23 +1203,47 @@
    * @param uid

    */

   @Transactional

   private void processShareJDOrder(JDOrder order, Long uid) {

   private void processShareJDOrder(JDOrder jdOrder, Long uid) {

      try {

         List<CommonOrder> commonOrderList = commonOrderService.addJDOrder(order, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);

         List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addJDOrder(jdOrder, uid);

         hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_SHARE_GOODS);

         if (isCommonOrderAllAdd(commonOrderList)) {

            Order order = new Order();

            order.setOrderId(jdOrder.getOrderId() + "");

            order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + jdOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + jdOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      }

   }



   /**

    * 是否是分享赚订单

    * 
    * @param order

    * @return

    */

   private boolean isShareOrder(PDDOrder pddOrder) {

      String positionId = pddOrder.getpId();

      if (PinDuoDuoApiUtil.PID_SHARE.equalsIgnoreCase(positionId))

         return true;

      else

         return false;

   }



   /**

@@ -1208,8 +1319,18 @@
      try {

         List<PDDOrder> pddOrderList = new ArrayList<>();

         pddOrderList.add(pddOrder);

         List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

         List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_ZIGOU);

         if (isCommonOrderAllAdd(commonOrderList)) {

            Order order = new Order();

            order.setOrderId(pddOrder.getOrderSn());

            order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addPDDOrder或addHongBao出错", "订单号:" + pddOrder.getOrderSn());

@@ -1232,21 +1353,31 @@
    * @param uid

    */

   @Transactional

   private void processSharePDDOrder(PDDOrder order, Long uid) {

   private void processSharePDDOrder(PDDOrder pddOrder, Long uid) {

      try {

         List<PDDOrder> pddOrderList = new ArrayList<>();

         pddOrderList.add(order);

         List<CommonOrder> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_SHARE_GOODS);

         pddOrderList.add(pddOrder);

         List<CommonOrderAddResultDTO> commonOrderList = commonOrderService.addPDDOrder(pddOrderList, uid);

         hongBaoV2Service.addHongBao(convertCommonOrder(commonOrderList), HongBaoV2.TYPE_SHARE_GOODS);

         if (isCommonOrderAllAdd(commonOrderList)) {

            Order order = new Order();

            order.setOrderId(pddOrder.getOrderSn());

            order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

      } catch (CommonOrderException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + pddOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

      } catch (HongBaoException e) {

         try {

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + order.getOrderId());

            LogHelper.errorDetailInfo(e, "addJDOrder或addHongBao出错", "订单号:" + pddOrder.getOrderId());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

@@ -1272,4 +1403,53 @@
         }



   }



   @Override

   public boolean isShareOrder(CommonOrder commonOrder) {

      switch (commonOrder.getSourceType()) {

      case Constant.SOURCE_TYPE_TAOBAO:

         return isShareOrder(taoBaoOrderService.selectByTradeId(commonOrder.getTradeId()));

      case Constant.SOURCE_TYPE_JD:

         return isShareOrder(jdOrderService.selectDetailByOrderId(Long.parseLong(commonOrder.getOrderNo())));

      case Constant.SOURCE_TYPE_PDD:

         return isShareOrder(pddOrderService.selectByOrderSn(commonOrder.getOrderNo()).get(0));

      }

      return false;

   }



   /**

    * 转为普通订单

    * 
    * @param dtoList

    * @return

    */

   private List<CommonOrder> convertCommonOrder(List<CommonOrderAddResultDTO> dtoList) {

      List<CommonOrder> commonOrderList = new ArrayList<>();

      if (dtoList != null)

         for (CommonOrderAddResultDTO dto : dtoList)

            commonOrderList.add(dto.getCommonOrder());

      return commonOrderList;

   }



   /**

    * 是否全是增加

    * 
    * @param list

    * @return

    */

   private boolean isCommonOrderAllAdd(List<CommonOrderAddResultDTO> list) {

      if (list == null || list.size() == 0)

         return false;

      int addCount = 0;

      if (list != null)

         for (CommonOrderAddResultDTO dto : list) {

            if (dto.getType() == CommonOrderAddResultDTO.TYPE_ADD)

               addCount++;

         }

      if (addCount == list.size())

         return true;

      else

         return false;

   }



}