Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -2,6 +2,7 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.HashMap;

import java.util.HashSet;

@@ -13,17 +14,20 @@
import javax.annotation.Resource;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Propagation;

import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;

import com.yeshi.fanli.dao.mybatis.AccountMessageMapper;

import com.yeshi.fanli.dao.mybatis.HongBaoManageMapper;

import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;

import com.yeshi.fanli.dao.mybatis.MoneyRecordMapper;

import com.yeshi.fanli.dao.mybatis.PidOrderMapper;

import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;

import com.yeshi.fanli.dao.mybatis.UserInfoMapper;

import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;

import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;

import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;

import com.yeshi.fanli.dao.mybatis.order.OrderMapper;

import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;

@@ -38,6 +42,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;

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

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

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

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

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

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

@@ -73,7 +78,6 @@
import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.AccountDetailsFactory;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;



@Service

public class OrderProcessServiceImpl implements OrderProcessService {

@@ -156,6 +160,9 @@
   @Resource

   private UserMoneyDetailMapper userMoneyDetailMapper;



   @Resource

   private HongBaoV2Mapper hongBaoV2Mapper;



   @Override

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

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

@@ -173,11 +180,11 @@
                  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);

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

@@ -226,16 +233,15 @@
         return false;

   }



   @Transactional

   @Override

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

      // 查询在Order中是否存在该订单号

      Iterator<String> its = orders.keySet().iterator();

      String tempOrderId="";

      String tempOrderId = "";

      while (its.hasNext()) {

         try {

            String orderId = its.next();

            tempOrderId=orderId;

            tempOrderId = orderId;

            // 处理红包与子红包

            // if (isRedisLockOrder(orderId))

            // continue;

@@ -302,7 +308,7 @@
   @Override

   public void fanli() {

      // 获取主红包

      List<HongBao> hongBaoList = hongBaoMapper.selectCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);

      //

      // /**

      // * 需要实时更新待返利的订单

@@ -338,16 +344,16 @@
      /**

       * 开始返利

       */

      for (HongBao hb : hongBaoList) {

      for (HongBaoV2 hb : hongBaoList) {

         //

         if (hb.getState() == HongBao.STATE_SHIXIAO || hb.getState() == HongBao.STATE_YILINGQU)

         if (hb.getState() == HongBaoV2.STATE_SHIXIAO || hb.getState() == HongBaoV2.STATE_YILINGQU)

            continue;



         if (hb.getPreGettime() == null || hb.getPreGettime() == 0

               || hb.getPreGettime() > System.currentTimeMillis())

         if (hb.getPreGetTime() == null || hb.getPreGetTime().getTime() == 0

               || hb.getPreGetTime().getTime() > System.currentTimeMillis())

            continue;

         try {

            CMQManager.getInstance().addFanLiMsg(hb);

            CMQManager.getInstance().addFanLiMsgNew(hb);

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

@@ -571,6 +577,84 @@
      }

   }



   @Resource

   private HongBaoOrderMapper hongBaoOrderMapper;



   @Override

   @Transactional

   public void fanli(HongBaoV2 hb) throws TaoBaoWeiQuanException {

      // 查询最新的红包数据

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

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

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

      if (hongBaoOrder == null) {

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

         return;

      }

      // 维权中的不返利

      List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "维权创建");

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

         return;



      taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "等待处理");

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



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

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

            accountDetailsMapper.insertSelective(accountDetails);



            // 插入新版资金明细

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

               }

            }



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

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

            }



         }

      }

   }



   @Override

   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

      if (orderList != null)

@@ -604,14 +688,10 @@
   @Override

   public void fanliInvaiteAndShare() {

      // 查出邀请赚与分享赚该返利的用户ID

      List<Long> shareUids = pidOrderMapper.getUidCanBalanceList();

      List<Long> inviteUids = hongBaoMapper.selectUidCanBalanceHongBaoByChildHongBao();

      List<Long> inviteAndShareUids = hongBaoV2Mapper.listUidCanBanlanceShareAndInvite(1000);

      Set<Long> uidSets = new HashSet<>();

      if (shareUids != null)

         for (Long uid : shareUids)

            uidSets.add(uid);

      if (inviteUids != null)

         for (Long uid : inviteUids)

      if (inviteAndShareUids != null)

         for (Long uid : inviteAndShareUids)

            uidSets.add(uid);

      // 根据用户ID

      Iterator<Long> its = uidSets.iterator();

@@ -626,13 +706,23 @@
      }

   }



   private HongBao filterWeiQuanINGHongBao(HongBao hongBao) {

   private HongBaoV2 filterWeiQuanINGHongBao(HongBaoV2 hongBao) {



      long hbId = hongBao.getId();

      if (hongBao.getParent() != null) {

         hbId = hongBao.getParent().getId();

      }



      HongBaoOrder hongbaoOrder = hongBaoOrderMapper.selectByHongBaoId(hbId);



      if (hongbaoOrder == null)

         return null;



      List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

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

            .selectListByOrderIdAndState(hongbaoOrder.getCommonOrder().getOrderNo(), "维权创建");



      List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList1 = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hongBao.getOrderId(), "等待处理");

            .selectListByOrderIdAndState(hongbaoOrder.getCommonOrder().getOrderNo(), "等待处理");

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

            || (taoBaoWeiQuanList1 != null && taoBaoWeiQuanList1.size() > 0)) {

         return null;

@@ -647,40 +737,41 @@
       * 处理邀请赚订单

       */

      // 查询UID的邀请赚订单

      List<HongBao> hongBaoList = hongBaoMapper.selectCanBalanceHongBaoByChildHongBaoAndUid(uid);

      List<Integer> types = new ArrayList<>();

      types.add(HongBaoV2.TYPE_YIJI);

      types.add(HongBaoV2.TYPE_ERJI);

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 1000);



      List<Long> hbIdList = new ArrayList<>();



      BigDecimal invitemoney = new BigDecimal(0);

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

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

      for (HongBao hongBao : hongBaoList) {

      for (HongBaoV2 hongBao : hongBaoList) {

         hongBao = filterWeiQuanINGHongBao(hongBao);

         if (hongBao == null)

            continue;



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

         if (hongBao.getState() == HongBao.STATE_BUKELINGQU || hongBao.getState() == HongBao.STATE_KELINGQU) {

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

         if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU || hongBao.getState() == HongBaoV2.STATE_KELINGQU) {

            invitemoney = invitemoney.add(hongBao.getMoney());

            HongBao updateHongBao = new HongBao();

            HongBaoV2 updateHongBao = new HongBaoV2();

            updateHongBao.setId(hongBao.getId());

            updateHongBao.setGetTime(System.currentTimeMillis());

            updateHongBao.setState(HongBao.STATE_YILINGQU);

            hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

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

            hbIdList.add(hongBao.getId());

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

            Date balanceTime = null;

            if (hongBao.getParent() != null)

               balanceTime = hongBao.getParent().getBalanceTime();

            else

               balanceTime = hongBao.getBalanceTime();



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



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

            if (balanceTime != null

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

               if (!StringUtil.isNullOrEmpty(hongBao.getOrderId()))

                  drawBackOrders.add(hongBao.getOrderId());

               else if (hongBao.getParent() != null && !StringUtil.isNullOrEmpty(hongBao.getParent().getOrderId()))

                  drawBackOrders.add(hongBao.getParent().getOrderId());

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

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

            }

         }

      }

@@ -689,33 +780,35 @@
       * 处理一级二级分享赚(属于邀请赚类型)

       */



      List<HongBao> totalHongBaoList = new ArrayList<>();

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

      // 查询UID的二级或者三级分享赚订单

      // TODO 暂时查询10000条数据，后面再做分页

      List<HongBao> hbList = hongBaoMapper.selectCanBalanceHongBaoByTypeAndUid(HongBao.TYPE_SHARE_YIJI, uid, 10000);

      types.clear();

      types.add(HongBaoV2.TYPE_SHARE_YIJI);

      types.add(HongBaoV2.TYPE_SHARE_ERJI);

      List<HongBaoV2> hbList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);



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

         totalHongBaoList.addAll(hbList);



      hbList = hongBaoMapper.selectCanBalanceHongBaoByTypeAndUid(HongBao.TYPE_SHARE_ERJI, uid, 10000);

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

         totalHongBaoList.addAll(hbList);



      for (HongBao hb : totalHongBaoList) {

         if (hb.getState() == HongBao.STATE_BUKELINGQU || hb.getState() == HongBao.STATE_KELINGQU) {

      for (HongBaoV2 hb : totalHongBaoList) {

         if (hb.getState() == HongBaoV2.STATE_BUKELINGQU || hb.getState() == HongBaoV2.STATE_KELINGQU) {

            hb = filterWeiQuanINGHongBao(hb);

            if (hb == null)

               continue;

            invitemoney = invitemoney.add(hb.getMoney());

            HongBao updateHongBao = new HongBao();

            HongBaoV2 updateHongBao = new HongBaoV2();

            updateHongBao.setId(hb.getId());

            updateHongBao.setGetTime(System.currentTimeMillis());

            updateHongBao.setState(HongBao.STATE_YILINGQU);

            hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBaoV2.STATE_YILINGQU);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

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

            hbIdList.add(hb.getId());

            if (!StringUtil.isNullOrEmpty(hb.getOrderId()))

               drawBackOrders.add(hb.getOrderId());



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

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

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

         }

      }



@@ -729,8 +822,23 @@


         // 添加新版详情记录

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, 0, 0, 0, invitemoney,

                  new Date());

            // 查询邀请赚的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();

            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS,

                  minDate, maxDate);

            long weiQuanCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ,

                  minDate, maxDate);

            long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                  minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

            userMoneyDetail.setId(accountDetails.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e) {

@@ -765,30 +873,32 @@
       */

      BigDecimal sharemoney = new BigDecimal(0);

      // 查询UID的分享赚订单

      List<PidOrder> pidOrderList = pidOrderMapper.getCanBalanceListByUid(uid);

      for (PidOrder pidOrder : pidOrderList) {

         HongBao hongBao = hongBaoMapper.selectByPrimaryKeyForUpdate(pidOrder.getHongBao().getId());

      types.clear();

      types.add(HongBaoV2.TYPE_SHARE_GOODS);

      List<HongBaoV2> hongBaoShareList = hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(types, uid, 10000);

      for (HongBaoV2 hongBao : hongBaoShareList) {

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

         hongBao = filterWeiQuanINGHongBao(hongBao);

         if (hongBao == null)

            continue;

         if (hongBao.getState() == HongBao.STATE_BUKELINGQU || hongBao.getState() == HongBao.STATE_KELINGQU) {

         if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU || hongBao.getState() == HongBaoV2.STATE_KELINGQU) {

            sharemoney = sharemoney.add(hongBao.getMoney());

            HongBao updateHongBao = new HongBao();

            HongBaoV2 updateHongBao = new HongBaoV2();

            updateHongBao.setId(hongBao.getId());

            updateHongBao.setGetTime(System.currentTimeMillis());

            updateHongBao.setGetTime(new Date());

            updateHongBao.setState(HongBao.STATE_YILINGQU);

            hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);

            updateHongBao.setUpdateTime(new Date());

            hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBao);

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

            hbIdList.add(hongBao.getId());

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

            Date balanceTime = null;

            if (hongBao.getParent() != null)

               balanceTime = hongBao.getParent().getBalanceTime();

            else

               balanceTime = hongBao.getBalanceTime();

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

            if (hongBaoOrder != null)

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

            if (balanceTime != null

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

               drawBackOrders.add(pidOrder.getOrderId());

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

            }

         }

      }

@@ -806,8 +916,24 @@


         // 添加新版详情记录

         try {

            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, 0, 0, 0, sharemoney,

                  new Date());

            // 计算本月的有效订单，失效订单，维权订单

            Calendar ca = Calendar.getInstance();



            Date maxDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            ca.add(Calendar.MONTH, -1);



            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_JS, minDate, maxDate);

            long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_WQ, minDate, maxDate);

            long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_SX, minDate, maxDate);



            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            userMoneyDetail.setId(accountDetails.getId());

            userMoneyDetailMapper.insert(userMoneyDetail);

         } catch (UserMoneyDetailException e) {

@@ -841,7 +967,7 @@
   @Resource

   private HongBaoV2Service hongBaoV2Service;



   @Transactional

   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

   @Override

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

         throws HongBaoException, OrderItemException {

@@ -875,7 +1001,6 @@
            }

         } else {

            uid = oldOrder.getUserInfo().getId();



         }

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

         if (uid == null)

@@ -899,19 +1024,23 @@
               thirdState = o.getOrderState();

               break;

            }



         if (StringUtil.isNullOrEmpty(thirdState))

            thirdState = "订单失效";

         updateOrder.setThirdState(thirdState);

         updateOrder.setThirdCreateTime(

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

         orderMapper.updateByPrimaryKeySelective(updateOrder);



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

         List<CommonOrder> commonOrderList = null;

         try {

            commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

         } catch (CommonOrderException e) {

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_ZIGOU);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

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

            } catch (Exception e1) {

               e1.printStackTrace();

            }

         }

@@ -935,15 +1064,13 @@
            return;



         // 用第一个子订单锁定用户

         for (TaoBaoOrder taoBaoOrder : orderList) {

            try {

               CommonOrder commonOrder = commonOrderService.addTaoBaoOrder(taoBaoOrder, uid);

               hongBaoV2Service.addHongBao(commonOrder, HongBaoV2.TYPE_SHARE_GOODS);

            } catch (CommonOrderException e) {

               e.printStackTrace();

            } catch (HongBaoException e1) {

               e1.printStackTrace();

            }

         try {

            List<CommonOrder> commonOrders = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrders, HongBaoV2.TYPE_SHARE_GOODS);

         } catch (CommonOrderException e) {

            e.printStackTrace();

         } catch (HongBaoException e1) {

            e1.printStackTrace();

         }

      }