配置文件修改

admin

2019-11-23 51a4ff5d777028d52a19c314a99f796334cb7b51

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -133,38 +133,12 @@
      List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);

      if (list == null || list.size() == 0)

         return;

      // 查询还未扣款的主红包

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

      for (TaoBaoWeiQuanOrder weiQuanOrder : list) {

         List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

               weiQuanOrder.getOrderItemId());

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

            for (CommonOrder commonOrder : orderList) {

               // 修改订单状态为维权

               CommonOrder co = new CommonOrder(commonOrder.getId());

               co.setState(CommonOrder.STATE_WQ);

               co.setUpdateTime(new Date());

               commonOrderMapper.updateByPrimaryKeySelective(co);



               HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

               if (hongBaoOrder.getCommonOrder() != null

                     && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))

               // 查询是否已经维权

               {

                  TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(

                        hongBaoOrder.getCommonOrder().getTradeId(),

                        hongBaoOrder.getHongBaoV2().getUserInfo().getId());

                  if (drawBack == null)// 添加还未扣款的子订单

                     mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

               }



            }

      }

      List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);



      if (mainHongBaoList == null || mainHongBaoList.size() == 0)

         return;

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

         //锁行，防止重复 操作

         // 锁行，防止重复 操作

         HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(mainHongBaoList.get(i).getId());

         mainHongBaoList.set(i, hb);

         // 只处理返利订单

@@ -297,44 +271,50 @@
      }

   }



   private List<HongBaoV2> getWeiQuanMainHongBao(List<TaoBaoWeiQuanOrder> list, String orderId) {

      // 查询是否为维权订单

      if (list == null || list.size() == 0)

         return null;

      // 获取和该订单号有关联的用户

      // 查询还未扣款的主红包

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

      for (TaoBaoWeiQuanOrder weiQuanOrder : list) {

         List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

               weiQuanOrder.getOrderItemId());

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

            for (CommonOrder commonOrder : orderList) {

               // 修改订单状态为维权

               CommonOrder co = new CommonOrder(commonOrder.getId());

               co.setState(CommonOrder.STATE_WQ);

               co.setUpdateTime(new Date());

               commonOrderMapper.updateByPrimaryKeySelective(co);



               HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

               if (hongBaoOrder.getCommonOrder() != null

                     && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))

               // 查询是否已经维权

               {

                  TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(

                        hongBaoOrder.getCommonOrder().getTradeId(),

                        hongBaoOrder.getHongBaoV2().getUserInfo().getId());

                  if (drawBack == null)// 添加还未扣款的子订单

                     mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

               }

            }

      }

      return mainHongBaoList;

   }



   @Transactional

   @Override

   public void doWeiQuanShare(String orderId) throws TaoBaoWeiQuanException {

      if (StringUtil.isNullOrEmpty(orderId))

         throw new TaoBaoWeiQuanException(1, "订单号为空值");

      // 查询是否为维权订单

      List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);

      if (list == null || list.size() == 0)

         return;

      // 获取和该订单号有关联的用户

      // 获取主红包(同一个订单号的单只会对应同一个用户)

      List<CommonOrderVO> typeList = new ArrayList<>();

      CommonOrderVO cv = new CommonOrderVO();

      cv.setSourceType(Constant.SOURCE_TYPE_TAOBAO);

      cv.setOrderNo(orderId);

      typeList.add(cv);



      List<CommonOrderVO> commonOrderList = commonOrderMapper.listOrderGoodsInfo(typeList);

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

      if (commonOrderList != null)

         for (CommonOrderVO vo : commonOrderList) {

            // 更改订单状态

            CommonOrder co = new CommonOrder(vo.getId());

            co.setState(CommonOrder.STATE_WQ);

            co.setUpdateTime(new Date());

            commonOrderMapper.updateByPrimaryKeySelective(co);

            HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(vo.getId());

            if (hongBaoOrder.getCommonOrder() != null

                  && !StringUtil.isNullOrEmpty(hongBaoOrder.getCommonOrder().getTradeId()))

            // 查询是否已经维权

            {

               TaoBaoWeiQuanDrawBack drawBack = taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(

                     hongBaoOrder.getCommonOrder().getTradeId(),

                     hongBaoOrder.getHongBaoV2().getUserInfo().getId());

               if (drawBack == null)// 添加还未扣款的子订单

                  mainHongBaoList.add(hongBaoOrder.getHongBaoV2());

            }

         }

      List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);

      if(list==null||list.size()==0)

         return;

      List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);



      if (mainHongBaoList == null || mainHongBaoList.size() == 0)

         return;