奖励详情跳转地址调整

yujian

2019-02-28 70c9043f312a52a922cb15490d90a172b3515060

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

@@ -36,6 +36,7 @@
import com.yeshi.fanli.entity.bus.user.HongBao;

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

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

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

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

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

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

@@ -67,7 +68,9 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

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

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

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

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

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

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

@@ -162,6 +165,12 @@
   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Resource

   private UserSystemCouponService userSystemCouponService;



   @Override

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

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

@@ -175,18 +184,25 @@
         String orderId = its.next();

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

            List<TaoBaoOrder> list = orders.get(orderId);

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

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

               // }

               // sharePidOrderMap.put(orderId, pidOrderList);



            if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {

               shareOrderMap.put(orderId, list);

            } else {// 普通返利订单

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

               fanliOrderMap.put(orderId, list);

            } else {

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

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

                  // }

                  // sharePidOrderMap.put(orderId, pidOrderList);

                  shareOrderMap.put(orderId, list);

               } else {// 普通返利订单

                  fanliOrderMap.put(orderId, list);

               }

            }

         }

      }

@@ -275,7 +291,16 @@
         Iterator<String> its = orders.keySet().iterator();

         while (its.hasNext()) {

            String orderId = its.next();

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

            try {

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

            } catch (Exception e) {

               try {

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

               } catch (Exception e1) {

                  e1.printStackTrace();

               }

            }



         }

      }

   }

@@ -503,7 +528,12 @@
         // 新版通知

         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

               userGoodsCount.get(uid), money, user.getMyHongBao());



      }

      // 通知免单到账

      try {

         userSystemCouponService.updateStateByArrivalAccount(hongBaoOrder.getCommonOrder().getOrderNo());

      } catch (Exception e) {

         e.printStackTrace();

      }



      // 维权扣款（2018-08-05后开始实行）

@@ -881,6 +911,25 @@
               // 加入到订单表

               orderMapper.insertSelective(order);

               oldOrder = order;

            } else {

               UserExtraTaoBaoInfo info = userExtraTaoBaoInfoService

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

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

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

                  // 插入到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();

@@ -922,7 +971,7 @@
            hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

         } catch (CommonOrderException e) {

            try {

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

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

            } catch (Exception e1) {

               e1.printStackTrace();

            }

@@ -941,6 +990,11 @@
         PidUser pidUser = pidUserMapper.selectByPid(pid);

         if (pidUser != null)

            uid = pidUser.getUid();

         else {

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

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

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

         }



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

         if (uid == null)