学院

yujian

2019-12-28 c3f10da9aa6f4d8fecccc1c9574567ee0766ab48

 fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java

@@ -213,7 +213,7 @@
      return CommonOrder.STATE_SX;

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,

         Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {

      System.out.println(commonOrder.getOrderNo());

@@ -337,7 +337,7 @@
                              HongBaoV2.TYPE_YIJI, MoneyBigDecimalUtil.mul(hongBao.getMoney(),

                                    firstRate.divide(new BigDecimal(100))));

                        if (firstHongbao != null)

                           addInviteHongBao(firstHongbao, notificationMap, commonOrder);

                           addInviteHongBao(firstHongbao, null, notificationMap, commonOrder);

                     }

                     boss = threeSaleSerivce.getBoss(boss.getId());

                     if (boss != null) {

@@ -352,7 +352,7 @@
                                 HongBaoV2.TYPE_ERJI, MoneyBigDecimalUtil.mul(hongBao.getMoney(),

                                       secondRate.divide(new BigDecimal(100))));

                           if (secondHongbao != null)

                              addInviteHongBao(secondHongbao, notificationMap, commonOrder);

                              addInviteHongBao(secondHongbao, null, notificationMap, commonOrder);

                        }

                     }

                  }

@@ -486,7 +486,7 @@
            HongBaoV2 firstHongbao = createInviteHongBao(boss.getId(), hongBao, commonOrder, HongBaoV2.TYPE_YIJI,

                  MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));



            addInviteHongBao(firstHongbao, notificationMap, commonOrder);

            addInviteHongBao(firstHongbao, null, notificationMap, commonOrder);



            // 插入二级子红包

            boss = threeSaleSerivce.getBoss(boss.getId());

@@ -498,7 +498,7 @@
               HongBaoV2 secondHongbao = createInviteHongBao(boss.getId(), hongBao, commonOrder,

                     HongBaoV2.TYPE_ERJI,

                     MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));

               addInviteHongBao(secondHongbao, notificationMap, commonOrder);

               addInviteHongBao(secondHongbao, null, notificationMap, commonOrder);

            }

         }



@@ -534,7 +534,7 @@
                     HongBaoV2.TYPE_SHARE_YIJI,

                     MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstLevelRate.divide(new BigDecimal(100))));



               addInviteHongBao(firstHongbao, notificationMap, commonOrder);

               addInviteHongBao(firstHongbao, hongBao.getUserInfo().getNickName(), notificationMap, commonOrder);



               // 二级分享赚

               boss = threeSaleSerivce.getBoss(boss.getId());

@@ -546,7 +546,7 @@
                  HongBaoV2 secondChild = createInviteHongBao(boss.getId(), hongBao, commonOrder,

                        HongBaoV2.TYPE_SHARE_ERJI, MoneyBigDecimalUtil.mul(hongBao.getMoney(),

                              secondLevelRate.divide(new BigDecimal(100))));

                  addInviteHongBao(secondChild, notificationMap, commonOrder);

                  addInviteHongBao(secondChild, null, notificationMap, commonOrder);

               }

            }

         }

@@ -584,8 +584,8 @@
    * @param notificationMap

    * @param commonOrder

    */

   private void addInviteHongBao(HongBaoV2 child, Map<Integer, HongBaoOrder> notificationMap,

         CommonOrder commonOrder) {

   private void addInviteHongBao(HongBaoV2 child, String parentHongBaoUserName,

         Map<Integer, HongBaoOrder> notificationMap, CommonOrder commonOrder) {

      if (child != null) {

         hongBaoV2Mapper.insertSelective(child);

         // 用户通知

@@ -593,6 +593,9 @@
            HongBaoV2 tempHongBao = new HongBaoV2(child.getId());

            tempHongBao.setUserInfo(child.getUserInfo());

            tempHongBao.setMoney(child.getMoney());

            if (child.getType() == HongBaoV2.TYPE_SHARE_YIJI)

               tempHongBao.setBeizhu(parentHongBaoUserName);



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

            tempCommonOrder.setPayment(commonOrder.getPayment());

            notificationMap.put(child.getType(), new HongBaoOrder(tempCommonOrder, tempHongBao));