大淘客与好单库与主包剥离

admin

2020-07-15 fe646416d8d46de7b896ddbf65a3ad0cd30b729b

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

@@ -86,6 +86,7 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.manger.msg.RocketMQManager;

import com.yeshi.fanli.service.manger.order.HongBaoV2AddManager;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

@@ -169,8 +170,8 @@
   @Resource(name = "orderTransactionProducer")

   private TransactionProducer orderTransactionProducer;



   @Resource(name = "producer")

   private Producer producer;

   @Resource

   private RocketMQManager rocketMQManager;



   @Resource

   private OrderMoneySettleService orderMoneySettleService;

@@ -293,7 +294,7 @@
      elmeOrder.setTrackPid(

            String.format("mm_124933865_%s_%s", taoBaoOrder.getSourceMediaId(), taoBaoOrder.getAdPositionId()));

      if (!StringUtil.isNullOrEmpty(taoBaoOrder.getRelationId())) {

         UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByRelationId(taoBaoOrder.getRelationId());

         UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService.getByRelationId(taoBaoOrder.getRelationId(),null);

         if (extraInfo != null)

            elmeOrder.setUid(extraInfo.getUser().getId());

      }

@@ -753,13 +754,13 @@
                  || pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_KOUBEI_PID))

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

               UserExtraTaoBaoInfo extraInfo = userExtraTaoBaoInfoService

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

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

               if (extraInfo != null) {

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

               }

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

               UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService

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

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

               if (info != null && info.getUser() != null)

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

            }

@@ -845,7 +846,7 @@
      if (orderList != null && orderList.size() > 0) {

         // 原来不存在订单

         Long uid = null;

         UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByRelationId(orderList.get(0).getRelationId());

         UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService.getByRelationId(orderList.get(0).getRelationId(),null);

         if (info != null && info.getUser() != null)

            uid = info.getUser().getId();

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

@@ -1699,7 +1700,7 @@
            OrderMQMsg mqMsg = new OrderMQMsg(orderId, sourceType, uid, OrderMQMsg.HANDLE_TYPE_ADD,

                  isCommonOrderValid(coList), 0, new Date(), result.isMiandan(),coList.get(0).getThirdCreateTime());

            Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_ORDER, OrderTopicTagEnum.orderStatistic, mqMsg);

            producer.send(msg);

            rocketMQManager.sendNormalMsg(msg, null);

         }

   }