分红修改

admin

2020-04-17 fed386fafac07d40fa3f3627b8fcef13e2d2ec4f

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

@@ -665,7 +665,6 @@
      List<Long> hbIdList = new ArrayList<>();

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

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

      int shareGoodsCount = 0;

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



      for (HongBaoV2 hongBao : hongBaoList) {

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

            if (hongBaoOrder != null) {

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

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

            }

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

            if (balanceTime != null

@@ -724,9 +722,8 @@
         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, sharemoney,

               userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());



         for (String orderId : drawBackOrders)

            taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);

@@ -757,7 +754,6 @@
      BigDecimal sharemoney = new BigDecimal(0);

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

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

      int shareGoodsCount = 0;

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



      for (HongBaoV2 hongBao : hongBaoList) {

@@ -778,9 +774,6 @@
            hbIdList.add(hongBao.getId());

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

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

            if (hongBaoOrder != null) {

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

            }

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

         }

      }

@@ -809,10 +802,8 @@
            }

         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

               shareGoodsCount, sharemoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), null,

               null);

         userMoneyMsgNotificationService.shareOrderReceived(uid, sourceType, sharemoney,

               userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao(), new Date());

      }



      hongBaoV2SettleTempService.addTemp(recieveHongBaoIds, key);

@@ -820,8 +811,8 @@
      // 所有的返利到账红包ID

      for (Long hongBaoId : recieveHongBaoIds) {

         try {

            if(Constant.ENABLE_MQ)

            HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

            if (Constant.ENABLE_MQ)

               HongBaoRecieveCMQManager.getInstance().addHongBaoRecieveMsg(hongBaoId);

         } catch (Exception e) {

            LogHelper.errorDetailInfo(e);

         }