Merge remote-tracking branch 'origin/div' into div

admin

2020-02-18 ddf5db7d31af51fcf697eac0cee7dd46ff73bcc1

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

@@ -114,7 +114,16 @@
   @Resource

   private HongBaoV2SettleTempService hongBaoV2SettleTempService;



   @Transactional(rollbackFor=Exception.class)

   //下级被封禁，红包失效

   private void invalidHongBaoForbidden(Long id) {

      HongBaoV2 updateHongBaoV2 = new HongBaoV2(id);

      updateHongBaoV2.setState(HongBaoV2.STATE_SHIXIAO);

      updateHongBaoV2.setBeizhu("封禁失效");

      updateHongBaoV2.setUpdateTime(new Date());

      hongBaoV2Mapper.updateByPrimaryKeySelective(updateHongBaoV2);

   }



   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSettleTB(Long uid) throws OrderMoneySettleException {

      // 查询UID的一二级邀请赚

@@ -145,6 +154,7 @@
                  // 上级用户不是正常用户，订单均不能到账

                  UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                     invalidHongBaoForbidden(item.getId());

                     hongBaoList.remove(i);

                     i--;

                  }

@@ -179,7 +189,7 @@
      System.out.println(new Gson().toJson(mqMsg));

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSettleJD(Long uid) throws OrderMoneySettleException {

      // 查询UID的一二级邀请赚

@@ -210,6 +220,7 @@
                  // 上级用户不是正常用户，订单均不能到账

                  UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                     invalidHongBaoForbidden(item.getId());

                     hongBaoList.remove(i);

                     i--;

                  }

@@ -238,7 +249,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSettlePDD(Long uid) throws OrderMoneySettleException {

      // 查询UID的一二级邀请赚

@@ -269,6 +280,7 @@
                  // 上级用户不是正常用户，订单均不能到账

                  UserInfo userInfo = userInfoMapper.selectAvailableByPrimaryKey(co.getUserInfo().getId());

                  if (userInfo == null || userInfo.getState() != UserInfo.STATE_NORMAL) {

                     invalidHongBaoForbidden(item.getId());

                     hongBaoList.remove(i);

                     i--;

                  }

@@ -297,7 +309,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleTB(Long uid) throws OrderMoneySettleException {

      /**

@@ -342,7 +354,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettleJD(Long uid) throws OrderMoneySettleException {

      /**

@@ -383,7 +395,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void shareSettlePDD(Long uid) throws OrderMoneySettleException {

      /**

@@ -424,7 +436,7 @@
      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void ziGouSettle(String orderId, int sourceType, String taskKey) throws OrderMoneySettleException {

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

@@ -467,6 +479,25 @@
                  userHongBao.put(uid, new ArrayList<>());

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

            }

         }

      }



      // 获取维权资金

      if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {

         try {

            Map<Long, BigDecimal> userSubMoneyMap = taoBaoWeiQuanDrawBackService.doWeiQuanFanli(orderId, false);

            if (userSubMoneyMap != null) {

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

                  Long uid = its.next();

                  if (userSubMoneyMap.get(uid) != null) {

                     // 减去维权资金

                     userMoney.put(uid, userMoney.get(uid).subtract(userSubMoneyMap.get(uid)));

                  }

               }

            }

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

            throw new OrderMoneySettleException(2, "维权订单出错");

         }

      }



@@ -521,31 +552,6 @@
         userSystemCouponService.updateStateByArrivalAccount(orderId);

      } catch (Exception e) {

         e.printStackTrace();

      }



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



      try {

         if (sourceType == Constant.SOURCE_TYPE_TAOBAO)

            taoBaoWeiQuanDrawBackService.doWeiQuanFanli(orderId);

      } catch (TaoBaoWeiQuanException e) {

         if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {

            List<TaoBaoOrder> olist = taoBaoOrderService.getTaoBaoOrderByOrderId(orderId);

            if (olist != null && olist.size() > 0) {

               long time = TimeUtil.convertToTimeTemp(olist.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss");

               olist = TaoKeOrderApiUtil.getTaoBaoCommonOrderList(time, time + 1000 * 2L, 1);

               if (olist != null && olist.size() > 0) {

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

                     if (!olist.get(i).getOrderId().equalsIgnoreCase(orderId)) {// 删除无关订单

                        olist.remove(i);

                        i--;

                     }

                  }

                  taoBaoOrderService.addTaoBaoOrderList(olist);

               }

            }

         } else

            throw new OrderMoneySettleException(e.getCode(), "维权处理出错:" + e.getMsg());

      }



      // 添加结算映射

@@ -956,7 +962,7 @@
    * @param orderId

    * @param sourceType

    */

   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void inviteSubsidySettle(Long uid, String taskKey) throws OrderMoneySettleException {

      // 查询key