订单错误信息捕捉修改

admin

2019-02-15 c12b6ec43f6c79426d6f2337f903d3c0a225e9a5

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

@@ -34,11 +34,9 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

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

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

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

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

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

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

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

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;

@@ -48,7 +46,6 @@
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.entity.taobao.TaobaoOrderHongBao;

import com.yeshi.fanli.exception.HongBaoException;

import com.yeshi.fanli.exception.ObjectStateException;

import com.yeshi.fanli.exception.OrderItemException;

@@ -60,6 +57,7 @@
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

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

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

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.OrderItemServcie;

@@ -70,9 +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.util.CMQManager;

import com.yeshi.fanli.util.HongBaoUtil;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

@@ -163,6 +161,12 @@
   @Resource

   private HongBaoV2Mapper hongBaoV2Mapper;



   @Resource

   private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



   @Resource

   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;



   @Override

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

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

@@ -176,18 +180,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);

               }

            }

         }

      }

@@ -276,7 +287,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();

               }

            }



         }

      }

   }

@@ -379,216 +399,18 @@
      return validCount >= list.size();

   }



   @Override

   @Transactional

   public void processShopingFanliOrder(String orderId, List<TaoBaoOrder> orderList)

         throws HongBaoException, OrderItemException {



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



      Order oldOrder = orderMapper.selectOrderByOrderId(orderId);

      // 原来不存在订单

      if (oldOrder == null && orderList.size() > 0) {

         // 获取产生订单的PID

         String mediaId = orderList.get(0).getSourceMediaId();

         String adzoneId = orderList.get(0).getAdPositionId();

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

         // 查询该PID是否有对应的用户

         PidUser pidUser = pidUserMapper.selectByPid(pid);

         // 判断是否属于返利的PID

         if (pidUser != null && (pidUser.getType() == PidUser.TYPE_FANLI_ANDROID

               || pidUser.getType() == PidUser.TYPE_FANLI_IOS)) {

            // 如果是订单失效就不处理

            // 2018-08-02开始生效

            if (isOrderValid(orderList))

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

                     .convertToTimeTemp("2018-08-02", "yyyy-MM-dd"))

                  return;



            // 添加到订单中去

            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(pidUser.getUid()));

            order.setVersion(2);



            // 加入到订单表

            orderMapper.insertSelective(order);

            oldOrder = order;

         }

      }



      if (oldOrder != null) {// 该订单号可以返利

         // 原来失效的订单不再处理

         // if (oldOrder.getState() == Order.STATE_SHIXIAO)

         // return;

         // 更新订单的状态

         Order updateOrder = new Order();

         updateOrder.setId(oldOrder.getId());

         updateOrder.setThirdCreateTime(

               new Date(TimeUtil.convertToTimeTemp(orderList.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss")));



         if (isOrderValid(orderList)) {

            // 处理订单失效

            updateOrder.setState(Order.STATE_SHIXIAO);

            if (oldOrder.getState() == Order.STATE_YIZHIFU)

               updateOrder.setDrawbackTime(System.currentTimeMillis());

            updateOrder.setThirdState("订单失效");

         } else// 计算订单的总金额

         {

            BigDecimal money = new BigDecimal(0);

            for (TaoBaoOrder o : orderList) {

               if (o.getOrderState().equalsIgnoreCase("订单结算"))

                  money = money.add(o.getSettlement());

               else {

                  money = money.add(o.getPayment());

               }

            }

            updateOrder.setMoney(money);

            String thirdState = null;

            for (TaoBaoOrder o : orderList)

               if (!o.getOrderState().equalsIgnoreCase("订单失效")) {

                  thirdState = o.getOrderState();

                  break;

               }

            updateOrder.setThirdState(thirdState);

         }

         orderMapper.updateByPrimaryKeySelective(updateOrder);

         Order order = oldOrder;

         // 订单返利比例

         BigDecimal rate = hongBaoManageService.getFanLiRate();



         // 查找是否存在红包

         List<HongBao> hongBaoList = hongBaoMapper.selectByOid(order.getId());

         // 还没有加入有效的订单

         if ((hongBaoList == null || hongBaoList.size() == 0)) {

            for (TaoBaoOrder taoBaoOrder : orderList) {

               // 创建OrderItem;

               OrderItem orderItem = orderItemService.addOrderItem(taoBaoOrder, order, rate);

               hongBaoService.addHongBao(order, taoBaoOrder, orderItem.getId());

            }

         } else if (hongBaoList.size() > 0)// 原来已经存在订单了

         {

            List<TaobaoOrderHongBao> sortList = HongBaoUtil.sortHongBaoAndTaoBaoOrder(orderList, hongBaoList);

            orderList = new ArrayList<>();

            hongBaoList = new ArrayList<>();

            if (sortList != null)

               for (TaobaoOrderHongBao tb : sortList) {

                  orderList.add(tb.taoBaoOrder);

                  hongBaoList.add(tb.hongBao);

               }



            if (orderList.size() != hongBaoList.size()) {

               LogHelper.userOrder("红包数和订单数不对等:" + orderId);

               return;

            }



            for (int i = 0; i < orderList.size(); i++) {

               hongBaoService.updateHongBao(hongBaoList.get(i), orderList.get(i));

               orderItemService.updateOrderItem(orderList.get(i), hongBaoList.get(i).getOrderItemId(), rate);

            }

         }



      }

   }



   @Override

   @Transactional

   public void fanli(HongBao hb) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb = hongBaoMapper.selectByPrimaryKeyForUpdate(hb.getId());

      // 维权中的不返利

      List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hb.getOrderId(), "维权创建");

      if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)

         return;



      taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(hb.getOrderId(), "等待处理");

      if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)

         return;



      long currentTimeMillis = System.currentTimeMillis();

      if (hb.getState() != HongBao.STATE_SHIXIAO) {

         // 设置为已返利

         // 处理主红包

         if (hb.getState() != HongBao.STATE_SHIXIAO && hb.getState() != HongBao.STATE_YILINGQU

               && hb.getType() == HongBao.TYPE_TAOBAO) {

            OrderItem orderItem = null;

            if (hb.getOrderItemId() != null) {

               orderItem = orderItemMapper.selectByPrimaryKey(hb.getOrderItemId());

               OrderItem updateOrderItem = new OrderItem();

               updateOrderItem.setId(orderItem.getId());

               updateOrderItem.setFanTime(currentTimeMillis);

               updateOrderItem.setState(OrderItem.STATE_DAOZHANG);

               orderItemMapper.updateByPrimaryKeySelective(updateOrderItem);

            }

            // 如果红包没被领取

            HongBao updateHongBao = new HongBao();

            updateHongBao.setId(hb.getId());

            updateHongBao.setState(HongBao.STATE_YILINGQU);

            updateHongBao.setGetTime(currentTimeMillis);

            hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);

            userInfoMapper.addHongBaoByUid(hb.getUserInfo().getId(), hb.getMoney());



            // ...消息、明细

            HongBaoExtra hongBaoExtra = HongBaoUtil.convert(hb);

            // 明细操作（如果服务器性好了后，可改成异步）

            MoneyRecord moneyRecord = new MoneyRecord(hb.getUserInfo(), hb, hb.getMoney(), hongBaoExtra.getTitle(),

                  "", currentTimeMillis, 1);

            moneyRecordMapper.insertSelective(moneyRecord);

            AccountDetails accountDetails = AccountDetailsFactory.create("+" + hb.getMoney(),

                  AccountDetailsFactory.FANLI, orderItem, null, hb.getUserInfo());

            accountDetailsMapper.insertSelective(accountDetails);



            // 插入新版资金明细

            try {

               UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),

                     hb.getOrderId(), 1, hb.getId(), hb.getMoney());

               userMoneyDetail.setId(accountDetails.getId());

               userMoneyDetailMapper.insert(userMoneyDetail);

            } catch (UserMoneyDetailException e1) {

               try {

                  LogHelper.errorDetailInfo(e1);

               } catch (Exception e2) {

                  e2.printStackTrace();

               }

            }



            // 添加资金明细与红包的映射关系

            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hb.getId(), accountDetails.getId());



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

            if (hb.getBalanceTime() != null

                  && hb.getBalanceTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

               taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hb.getOrderId());

            }



            // 站内信+推送

            try {

               userNotificationService.orderFanliRecieved(hb.getUserInfo().getId(), orderItem.getOrderId(),

                     orderItem.getFanMoney());

            } catch (Exception e) {

            }



         }

      }

   }



   @Resource

   private HongBaoOrderMapper hongBaoOrderMapper;



   @Override

   @Transactional

   public void fanli(HongBaoV2 hb) throws TaoBaoWeiQuanException {

   public void fanli(HongBaoV2 hb1) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

      hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb.getId());

      hb1 = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hb1.getId());

      // 查询红包相关联的订单

      HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb.getId());

      HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb1.getId());

      if (hongBaoOrder == null) {

         LogHelper.error("返利失败:" + hb.getId());

         LogHelper.error("返利失败:" + hb1.getId());

         return;

      }

      // 维权中的不返利

@@ -602,57 +424,115 @@
      if (taoBaoWeiQuanList != null && taoBaoWeiQuanList.size() > 0)

         return;



      long currentTimeMillis = System.currentTimeMillis();

      if (hb.getState() != HongBao.STATE_SHIXIAO) {

         // 设置为已返利

         // 处理主红包

         if (hb.getState() != HongBaoV2.STATE_SHIXIAO && hb.getState() != HongBaoV2.STATE_YILINGQU

               && hb.getType() == HongBaoV2.TYPE_ZIGOU) {

            // 如果红包没被领取

            HongBaoV2 updateHongBao = new HongBaoV2();

            updateHongBao.setId(hb.getId());

            updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

            updateHongBao.setGetTime(new Date(currentTimeMillis));

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

            userInfoMapper.addHongBaoByUid(hb.getUserInfo().getId(), hb.getMoney());

      // 查询同一订单号的红包

      List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(

            hongBaoOrder.getCommonOrder().getSourceType(), hongBaoOrder.getCommonOrder().getOrderNo());

      List<HongBaoV2> hongBaoList = new ArrayList<>();

      Map<Long, BigDecimal> userMoney = new HashMap<>();

      Map<Long, List<HongBaoV2>> userHongBao = new HashMap<>();

      Map<Long, Integer> userGoodsCount = new HashMap<>();

      // Map<Long, BigDecimal> userPayMent = new HashMap<>();

      for (CommonOrder co : orderList) {

         hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(co.getId());

         hongBaoList.add(hongBaoOrder.getHongBaoV2());

         Long uid = co.getUserInfo().getId();

         if (userGoodsCount.get(uid) == null)

            userGoodsCount.put(uid, co.getCount());

         else

            userGoodsCount.put(uid, Integer.valueOf(co.getCount() + userGoodsCount.get(uid)));

         // if (userPayMent.get(uid) == null)

         // userPayMent.put(uid, new BigDecimal(0));

         // if (co.getState() == CommonOrder.STATE_JS)

         // userPayMent.put(uid,

         // userPayMent.get(uid).add(co.getSettlement()));

         // else

         // userPayMent.put(uid, userPayMent.get(uid).add(co.getPayment()));

      }



            AccountDetails accountDetails = AccountDetailsFactory.create("+" + hb.getMoney(),

                  AccountDetailsFactory.FANLI, null, null, hb.getUserInfo());

            accountDetailsMapper.insertSelective(accountDetails);

      for (HongBaoV2 hb : hongBaoList) {

         long currentTimeMillis = System.currentTimeMillis();

         if (hb.getState() != HongBao.STATE_SHIXIAO) {

            // 设置为已返利

            // 处理主红包

            if (hb.getState() != HongBaoV2.STATE_SHIXIAO && hb.getState() != HongBaoV2.STATE_YILINGQU

                  && hb.getType() == HongBaoV2.TYPE_ZIGOU) {

               // 如果红包没被领取

               Long uid = hb.getUserInfo().getId();

               HongBaoV2 updateHongBao = new HongBaoV2();

               updateHongBao.setId(hb.getId());

               updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

               updateHongBao.setGetTime(new Date(currentTimeMillis));

               hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

               if (userMoney.get(uid) == null)

                  userMoney.put(uid, hb.getMoney());

               else

                  userMoney.put(uid, userMoney.get(uid).add(hb.getMoney()));



            // 插入新版资金明细

            try {

               UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),

                     hongBaoOrder.getCommonOrder().getOrderNo(), hongBaoOrder.getCommonOrder().getSourceType(),

                     hb.getId(), hb.getMoney());

               userMoneyDetail.setId(accountDetails.getId());

               userMoneyDetailMapper.insert(userMoneyDetail);

            } catch (UserMoneyDetailException e1) {

               try {

                  LogHelper.errorDetailInfo(e1);

               } catch (Exception e2) {

                  e2.printStackTrace();

               }

               // 添加红包到用户

               if (userHongBao.get(uid) == null)

                  userHongBao.put(uid, new ArrayList<>());

               userHongBao.get(uid).add(hb);

            }



            // 添加资金明细与红包的映射关系

            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hb.getId(), accountDetails.getId());



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

            if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder()

                  .getSettleTime().getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

               taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());

            }



            // 站内信+推送

            try {

               userNotificationService.orderFanliRecieved(hb.getUserInfo().getId(),

                     hongBaoOrder.getCommonOrder().getOrderNo(), hb.getMoney());

            } catch (Exception e) {

            }



         }

      }



      Iterator<Long> its = userMoney.keySet().iterator();



      while (its.hasNext()) {

         // 将自己添加到用户

         Long uid = its.next();

         BigDecimal money = userMoney.get(uid);

         userInfoMapper.addHongBaoByUid(uid, money);



         AccountDetails accountDetails = AccountDetailsFactory.create("+" + money, AccountDetailsFactory.FANLI, null,

               null, new UserInfo(uid));

         accountDetailsMapper.insertSelective(accountDetails);



         // 插入新版资金明细

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(uid,

                  hongBaoOrder.getCommonOrder().getOrderNo(), hongBaoOrder.getCommonOrder().getSourceType(), null,

                  money);

            userMoneyDetail.setId(accountDetails.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e1) {

            try {

               LogHelper.errorDetailInfo(e1);

            } catch (Exception e2) {

               e2.printStackTrace();

            }

         }



         // 添加资金明细与红包的映射关系

         for (HongBaoV2 v2 : userHongBao.get(uid)) {

            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(v2.getId(), accountDetails.getId());

         }



         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

         try {

            userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

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

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }



         // 新版通知

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

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



      }



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

      if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()

            .getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

         taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());

      }



   }



   @Override

@@ -745,6 +625,9 @@
      List<Long> hbIdList = new ArrayList<>();



      BigDecimal invitemoney = new BigDecimal(0);

      Set<String> inviteOrders = new HashSet<>();

      int inviteGoodsCount = 0;



      // 需要判断退款的订单号

      Set<String> drawBackOrders = new HashSet<String>();

      for (HongBaoV2 hongBao : hongBaoList) {

@@ -763,9 +646,12 @@
            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

            // 添加到红包返利记录集合

            hbIdList.add(hongBao.getId());



            // 2018-08-05 过后的订单才处理维权



            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getParent().getId());

            inviteGoodsCount += hongBaoOrder.getCommonOrder().getCount();

            inviteOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());



            Date balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();

            if (balanceTime != null

@@ -807,6 +693,8 @@
            hbIdList.add(hb.getId());



            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hb.getParent().getId());

            inviteGoodsCount += hongBaoOrder.getCommonOrder().getCount();

            inviteOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

            if (!StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getOrderNo()))

               drawBackOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

         }

@@ -857,10 +745,16 @@
         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengInviteRecieved(uid, invitemoney);

            userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,

                  invitemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

      }

@@ -871,6 +765,9 @@
      /**

       * 处理分享赚

       */



      int shareGoodsCount = 0;

      Set<String> shareOrders = new HashSet<>();

      BigDecimal sharemoney = new BigDecimal(0);

      // 查询UID的分享赚订单

      types.clear();

@@ -896,6 +793,7 @@
            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByHongBaoId(hongBao.getId());

            if (hongBaoOrder != null)

               balanceTime = hongBaoOrder.getCommonOrder().getSettleTime();

            shareOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

            if (balanceTime != null

                  && balanceTime.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

               drawBackOrders.add(hongBaoOrder.getCommonOrder().getOrderNo());

@@ -951,10 +849,16 @@
         // 发送推送

         try {

            // 提成到账消息通知

            userNotificationService.tiChengShareRecieved(uid, sharemoney);

            userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,

                  sharemoney);

         } catch (Exception e) {

            e.printStackTrace();

         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

      }

@@ -998,6 +902,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();

@@ -1039,7 +962,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();

            }

@@ -1058,6 +981,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)