邀请码添加返回状态

yujian

2019-01-22 88b54772dbcf5ecab1e2316e4e4626ac901b8908

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -508,8 +508,8 @@


         // 加入通知

         if (notificationMap.get(type) == null) {

            HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());

            tempHongBao.setUserInfo(hongBao.getUserInfo());

            HongBaoV2 tempHongBao = new HongBaoV2(oldHongBao.getId());

            tempHongBao.setUserInfo(oldHongBao.getUserInfo());

            tempHongBao.setMoney(hongBao.getMoney());

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

            tempCommonOrder.setPayment(commonOrder.getPayment());

@@ -741,21 +741,21 @@
            }

            hongBaoV2Mapper.insertSelective(firstHongbao);

            // 用户通知

            if (notificationMap.get(type) == null) {

            if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {

               HongBaoV2 tempHongBao = new HongBaoV2(firstHongbao.getId());

               tempHongBao.setUserInfo(firstHongbao.getUserInfo());

               tempHongBao.setMoney(firstHongbao.getMoney());

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

               tempCommonOrder.setPayment(commonOrder.getPayment());

               notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));

               notificationMap.put(HongBaoV2.TYPE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));

            } else {

               // 增加付款金额与资金

               HongBaoOrder tempHongBaoOrder = notificationMap.get(type);

               HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_YIJI);

               tempHongBaoOrder.getCommonOrder()

                     .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));

               tempHongBaoOrder.getHongBaoV2()

                     .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(firstHongbao.getMoney()));

               notificationMap.put(type, tempHongBaoOrder);

               notificationMap.put(HongBaoV2.TYPE_YIJI, tempHongBaoOrder);

            }



            // 插入二级子红包

@@ -789,21 +789,21 @@
               hongBaoV2Mapper.insertSelective(secondHongbao);



               // 用户通知

               if (notificationMap.get(type) == null) {

               if (notificationMap.get(HongBaoV2.TYPE_ERJI) == null) {

                  HongBaoV2 tempHongBao = new HongBaoV2(secondHongbao.getId());

                  tempHongBao.setUserInfo(secondHongbao.getUserInfo());

                  tempHongBao.setMoney(secondHongbao.getMoney());

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

                  tempCommonOrder.setPayment(commonOrder.getPayment());

                  notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));

                  notificationMap.put(HongBaoV2.TYPE_ERJI, new HongBaoOrder(tempCommonOrder, tempHongBao));

               } else {

                  // 增加付款金额与资金

                  HongBaoOrder tempHongBaoOrder = notificationMap.get(type);

                  HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_ERJI);

                  tempHongBaoOrder.getCommonOrder().setPayment(

                        tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));

                  tempHongBaoOrder.getHongBaoV2()

                        .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(secondHongbao.getMoney()));

                  notificationMap.put(type, tempHongBaoOrder);

                  notificationMap.put(HongBaoV2.TYPE_ERJI, tempHongBaoOrder);

               }

            }