Merge branch 'div_12'

yujian

2019-05-14 ad9fbd2c18f280ef9bba47f28353d367cf2d94e8

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

@@ -54,6 +54,7 @@
import com.yeshi.fanli.service.inter.order.OrderProcessService;

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

import com.yeshi.fanli.service.inter.push.PushService;

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

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

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

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

@@ -138,6 +139,9 @@


   @Resource

   private UserMoneyService userMoneyService;



   @Resource

   private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;



   @Override

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

@@ -579,8 +583,8 @@
               if (drawBack == null) {// 还未扣款

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

                     try {

                        LogHelper.errorDetailInfo(e, null, "订单号:" + order.getOrderId());

@@ -923,15 +927,21 @@
               orderMapper.insertSelective(order);

               oldOrder = order;

            } else {

               UserExtraTaoBaoInfo info = null;



               Long targetUid = null;

               if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)

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

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

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



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

                  info = userExtraTaoBaoInfoService.getBySpecialId(orderList.get(0).getSpecialId());

                  UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService

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

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

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

               }

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

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



               if (targetUid != null) {

                  uid = targetUid;

                  // 插入到Order中

                  // 添加到订单中去

                  Order order = new Order();