From 59aced4fe04f7e2fdcca81cb9ef279a70522301e Mon Sep 17 00:00:00 2001 From: yujian <yujian@163.com> Date: 星期三, 25 十二月 2019 12:30:44 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java index 9a0f072..ac0b95a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/HongBaoV2AddManager.java @@ -213,7 +213,7 @@ return CommonOrder.STATE_SX; } - @Transactional(rollbackFor=Exception.class) + @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)); -- Gitblit v1.8.0