消息

yujian

2020-04-11 17e98d7bcc27072f97976d24eb504abb02914891

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

@@ -166,6 +166,7 @@
   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;





   /**

    * 是否是分享订单

    * 

@@ -214,11 +215,14 @@
            String pid = String.format("mm_%s_%s_%s", configList.get(0).getAccountId(),

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

            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {

               // 处理饿了么订单

               elmeOrderMap.put(orderId, list);

            }



            else {

               // 饿了么订单开始归入到淘宝订单

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil

                     .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {

                  fanliOrderMap.put(orderId, list);

               } else {

                  elmeOrderMap.put(orderId, list);

               }

            } else {

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

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

                  fanliOrderMap.put(orderId, list);

@@ -494,6 +498,7 @@
                           hongBaoOrder.getCommonOrder().getSourceType(), key);

                     return TransactionStatus.CommitTransaction;

                  } catch (Exception e) {

                     e.printStackTrace();

                     return TransactionStatus.RollbackTransaction;

                  }

               }

@@ -547,7 +552,7 @@
               if (drawBack == null) {// 还未扣款

                  OrderLogHelper.taoBaoWeiQuan("已到账未扣款处理:子订单号:" + order.getOrderItemId());

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(),true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

@@ -667,9 +672,16 @@
         if (oldOrder == null) {

            Long targetUid = null;

            if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理非返利商品库的商品

               targetUid = taoBaoBuyRelationMapService.selectUidByRelationId(orderList.get(0).getRelationId());



            } else if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_ELEME_PID)

                  && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {// 处理饿了么的订单

               UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService

                     .getByRelationId(orderList.get(0).getRelationId());

               if (extraInfo != null) {

                  targetUid = extraInfo.getUser().getId();

               }

            } else if (!StringUtil.isNullOrEmpty(orderList.get(0).getSpecialId())) {

               UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService

                     .getBySpecialId(orderList.get(0).getSpecialId());

@@ -738,7 +750,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (!Constant.IS_TEST)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }